Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 hugh
|
a607d2cbb4 | ||
|
hugh
|
f7a74dbdda | ||
|
hugh
|
a8ae4ae1d0 | ||
|
hugh
|
c80370501b | ||
|
hugh
|
ca0c6b2181 | ||
|
hugh
|
05de23afe8 | ||
|
hugh
|
c70dc08ef5 | ||
|
hugh
|
94d587705c | ||
|
hugh
|
aa6c87ab90 |
+2
-1
@@ -7,7 +7,8 @@ nbactions.xml
|
||||
*.log
|
||||
docker.sock
|
||||
.DS_Store
|
||||
.settings/
|
||||
.classpath
|
||||
.factorypath
|
||||
.settings/
|
||||
.project
|
||||
AGENTS.md
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>com.unicenta</groupId>
|
||||
<artifactId>unicentaopos</artifactId>
|
||||
<version>5.4.0</version>
|
||||
<packaging>jar</packaging>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<derby.version>10.14.2.0</derby.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
@@ -116,7 +115,6 @@
|
||||
<artifactId>poi</artifactId>
|
||||
<version>3.17</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.poi</groupId>
|
||||
<artifactId>poi-ooxml</artifactId>
|
||||
@@ -181,7 +179,6 @@
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.swinglabs.swingx</groupId>
|
||||
@@ -293,7 +290,6 @@
|
||||
<artifactId>DynamicJasper-core-fonts</artifactId>
|
||||
<version>2.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jdt.core.compiler</groupId>
|
||||
<artifactId>ecj</artifactId>
|
||||
@@ -361,7 +357,7 @@
|
||||
<dependency>
|
||||
<groupId>com.unicenta</groupId>
|
||||
<artifactId>unicenta-plugins</artifactId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.2-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.gluonhq</groupId>
|
||||
@@ -450,7 +446,6 @@
|
||||
<version>4.2.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
|
||||
@@ -19,10 +19,93 @@
|
||||
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
|
||||
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
|
||||
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
|
||||
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-128,0,0,1,-51"/>
|
||||
</AuxValues>
|
||||
|
||||
<Layout>
|
||||
<DimensionLayout dim="0">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" attributes="0">
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" attributes="0">
|
||||
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<Component id="m_jVisible" min="-2" pref="207" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Component id="m_jRole" min="-2" pref="180" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Component id="m_jImage" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<Component id="jLblCardID" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Component id="m_jcard" min="-2" pref="180" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="webCBSecurity" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="m_jName" min="-2" pref="180" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</Group>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
<DimensionLayout dim="1">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" alignment="1" attributes="0">
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="3" attributes="0">
|
||||
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="m_jName" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="2" attributes="0">
|
||||
<Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="2" attributes="0">
|
||||
<Component id="jLblCardID" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="m_jcard" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="webCBSecurity" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="3" attributes="0">
|
||||
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="m_jRole" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Component id="jLabel3" min="-2" pref="25" max="-2" attributes="0"/>
|
||||
<Component id="m_jVisible" min="-2" pref="25" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace min="-2" pref="15" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Component id="m_jImage" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
</Layout>
|
||||
<SubComponents>
|
||||
<Component class="javax.swing.JLabel" name="nameLabel">
|
||||
<Component class="javax.swing.JLabel" name="jLabel1">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
@@ -38,10 +121,10 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
<Events>
|
||||
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/>
|
||||
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/>
|
||||
</Events>
|
||||
</Component>
|
||||
<Component class="javax.swing.JTextField" name="nameTextField">
|
||||
<Component class="javax.swing.JTextField" name="m_jName">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
@@ -51,7 +134,7 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JCheckBox" name="isVisible">
|
||||
<Component class="javax.swing.JCheckBox" name="m_jVisible">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="12" style="0"/>
|
||||
@@ -61,7 +144,7 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="visiableLabel">
|
||||
<Component class="javax.swing.JLabel" name="jLabel3">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
@@ -74,7 +157,7 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="imageLabel">
|
||||
<Component class="javax.swing.JLabel" name="jLabel4">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
@@ -87,7 +170,7 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor">
|
||||
<Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="12" style="0"/>
|
||||
@@ -127,7 +210,7 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="roleLabel">
|
||||
<Component class="javax.swing.JLabel" name="jLabel2">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
@@ -140,7 +223,7 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JTextField" name="cardIdTextField">
|
||||
<Component class="javax.swing.JTextField" name="m_jcard">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
@@ -150,7 +233,7 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="cardIdLabel">
|
||||
<Component class="javax.swing.JLabel" name="jLblCardID">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
@@ -163,7 +246,33 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="passwordLabel">
|
||||
<Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
|
||||
<Properties>
|
||||
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
|
||||
<StringArray count="3">
|
||||
<StringItem index="0" value="Generate new key"/>
|
||||
<StringItem index="1" value="Delete exisitng key"/>
|
||||
<StringItem index="2" value="Use iButton ID"/>
|
||||
</StringArray>
|
||||
</Property>
|
||||
<Property name="selectedIndex" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
|
||||
<Connection code="0" type="code"/>
|
||||
</Property>
|
||||
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="pos_messages.properties" key="tooltip.peoplesecurity" replaceFormat="AppLocal.getIntString("tooltip.peoplesecurity")"/>
|
||||
</Property>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
</Property>
|
||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||
<Dimension value="[140, 45]"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
<Events>
|
||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
|
||||
</Events>
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="jLabel6">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
@@ -176,12 +285,5 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="taxIdLabel">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="Tax ID"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JTextField" name="taxIdTextField">
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Form>
|
||||
|
||||
@@ -52,12 +52,9 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
|
||||
private final ComboBoxValModel m_ReasonModel;
|
||||
|
||||
/**
|
||||
* Creates new form PeopleEditor
|
||||
*
|
||||
/** Creates new form PeopleEditor
|
||||
* @param dlAdmin
|
||||
* @param dirty
|
||||
*/
|
||||
* @param dirty */
|
||||
public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
|
||||
|
||||
initComponents();
|
||||
@@ -67,11 +64,11 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
m_RoleModel = new ComboBoxValModel();
|
||||
|
||||
m_Dirty = dirty;
|
||||
nameTextField.getDocument().addDocumentListener(dirty);
|
||||
m_jName.getDocument().addDocumentListener(dirty);
|
||||
m_jRole.addActionListener(dirty);
|
||||
isVisible.addActionListener(dirty);
|
||||
imageEditor.addPropertyChangeListener("image", dirty);
|
||||
cardIdTextField.getDocument().addDocumentListener(dirty);
|
||||
m_jVisible.addActionListener(dirty);
|
||||
m_jImage.addPropertyChangeListener("image", dirty);
|
||||
m_jcard.getDocument().addDocumentListener(dirty);
|
||||
|
||||
m_ReasonModel = new ComboBoxValModel();
|
||||
m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
|
||||
@@ -89,17 +86,17 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
@Override
|
||||
public void writeValueEOF() {
|
||||
m_oId = null;
|
||||
nameTextField.setText(null);
|
||||
m_jName.setText(null);
|
||||
m_sPassword = null;
|
||||
m_RoleModel.setSelectedKey(null);
|
||||
isVisible.setSelected(false);
|
||||
cardIdTextField.setText(null);
|
||||
imageEditor.setImage(null);
|
||||
nameTextField.setEnabled(false);
|
||||
m_jVisible.setSelected(false);
|
||||
m_jcard.setText(null);
|
||||
m_jImage.setImage(null);
|
||||
m_jName.setEnabled(false);
|
||||
m_jRole.setEnabled(false);
|
||||
isVisible.setEnabled(false);
|
||||
cardIdTextField.setEnabled(false);
|
||||
imageEditor.setEnabled(false);
|
||||
m_jVisible.setEnabled(false);
|
||||
m_jcard.setEnabled(false);
|
||||
m_jImage.setEnabled(false);
|
||||
jButton1.setEnabled(false);
|
||||
webCBSecurity.setEnabled(false);
|
||||
}
|
||||
@@ -110,17 +107,17 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
@Override
|
||||
public void writeValueInsert() {
|
||||
m_oId = null;
|
||||
nameTextField.setText(null);
|
||||
m_jName.setText(null);
|
||||
m_sPassword = null;
|
||||
m_RoleModel.setSelectedKey(null);
|
||||
isVisible.setSelected(true);
|
||||
cardIdTextField.setText(null);
|
||||
imageEditor.setImage(null);
|
||||
nameTextField.setEnabled(true);
|
||||
m_jVisible.setSelected(true);
|
||||
m_jcard.setText(null);
|
||||
m_jImage.setImage(null);
|
||||
m_jName.setEnabled(true);
|
||||
m_jRole.setEnabled(true);
|
||||
isVisible.setEnabled(true);
|
||||
cardIdTextField.setEnabled(true);
|
||||
imageEditor.setEnabled(true);
|
||||
m_jVisible.setEnabled(true);
|
||||
m_jcard.setEnabled(true);
|
||||
m_jImage.setEnabled(true);
|
||||
jButton1.setEnabled(true);
|
||||
webCBSecurity.setEnabled(true);
|
||||
}
|
||||
@@ -133,18 +130,18 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
public void writeValueDelete(Object value) {
|
||||
Object[] people = (Object[]) value;
|
||||
m_oId = people[0];
|
||||
nameTextField.setText(Formats.STRING.formatValue(people[1]));
|
||||
m_jName.setText(Formats.STRING.formatValue(people[1]));
|
||||
m_sPassword = Formats.STRING.formatValue(people[2]);
|
||||
m_RoleModel.setSelectedKey(people[3]);
|
||||
isVisible.setSelected(((Boolean) people[4]).booleanValue());
|
||||
cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
|
||||
imageEditor.setImage((BufferedImage) people[6]);
|
||||
m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
|
||||
m_jcard.setText(Formats.STRING.formatValue(people[5]));
|
||||
m_jImage.setImage((BufferedImage) people[6]);
|
||||
|
||||
nameTextField.setEnabled(false);
|
||||
m_jName.setEnabled(false);
|
||||
m_jRole.setEnabled(false);
|
||||
isVisible.setEnabled(false);
|
||||
cardIdTextField.setEnabled(false);
|
||||
imageEditor.setEnabled(false);
|
||||
m_jVisible.setEnabled(false);
|
||||
m_jcard.setEnabled(false);
|
||||
m_jImage.setEnabled(false);
|
||||
jButton1.setEnabled(false);
|
||||
webCBSecurity.setEnabled(false);
|
||||
}
|
||||
@@ -157,25 +154,25 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
public void writeValueEdit(Object value) {
|
||||
Object[] people = (Object[]) value;
|
||||
m_oId = people[0];
|
||||
nameTextField.setText(Formats.STRING.formatValue(people[1]));
|
||||
m_jName.setText(Formats.STRING.formatValue(people[1]));
|
||||
m_sPassword = Formats.STRING.formatValue(people[2]);
|
||||
m_RoleModel.setSelectedKey(people[3]);
|
||||
isVisible.setSelected(((Boolean) people[4]).booleanValue());
|
||||
cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
|
||||
imageEditor.setImage((BufferedImage) people[6]);
|
||||
m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
|
||||
m_jcard.setText(Formats.STRING.formatValue(people[5]));
|
||||
m_jImage.setImage((BufferedImage) people[6]);
|
||||
|
||||
if (cardIdTextField.getText().length() == 16) {
|
||||
cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
|
||||
if (m_jcard.getText().length() == 16) {
|
||||
jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
|
||||
} else {
|
||||
cardIdLabel.setText(AppLocal.getIntString("label.card"));
|
||||
jLblCardID.setText(AppLocal.getIntString("label.card"));
|
||||
}
|
||||
System.out.println(cardIdTextField.getText().length());
|
||||
System.out.println(m_jcard.getText().length());
|
||||
|
||||
nameTextField.setEnabled(true);
|
||||
m_jName.setEnabled(true);
|
||||
m_jRole.setEnabled(true);
|
||||
isVisible.setEnabled(true);
|
||||
cardIdTextField.setEnabled(true);
|
||||
imageEditor.setEnabled(true);
|
||||
m_jVisible.setEnabled(true);
|
||||
m_jcard.setEnabled(true);
|
||||
m_jImage.setEnabled(true);
|
||||
jButton1.setEnabled(true);
|
||||
webCBSecurity.setEnabled(true);
|
||||
}
|
||||
@@ -189,12 +186,12 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
public Object createValue() throws BasicException {
|
||||
Object[] people = new Object[7];
|
||||
people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
|
||||
people[1] = Formats.STRING.parseValue(nameTextField.getText());
|
||||
people[1] = Formats.STRING.parseValue(m_jName.getText());
|
||||
people[2] = Formats.STRING.parseValue(m_sPassword);
|
||||
people[3] = m_RoleModel.getSelectedKey();
|
||||
people[4] = isVisible.isSelected();
|
||||
people[5] = Formats.STRING.parseValue(cardIdTextField.getText());
|
||||
people[6] = imageEditor.getImage();
|
||||
people[4] = m_jVisible.isSelected();
|
||||
people[5] = Formats.STRING.parseValue(m_jcard.getText());
|
||||
people[6] = m_jImage.getImage();
|
||||
return people;
|
||||
}
|
||||
|
||||
@@ -217,6 +214,7 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
m_jRole.setModel(m_RoleModel);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@@ -224,66 +222,57 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
public void refresh() {
|
||||
}
|
||||
|
||||
/**
|
||||
* This method is called from within the constructor to
|
||||
/** This method is called from within the constructor to
|
||||
* initialize the form.
|
||||
* WARNING: Do NOT modify this code. The content of this method is
|
||||
* always regenerated by the Form Editor.
|
||||
*/
|
||||
// <editor-fold defaultstate="collapsed" desc="Generated
|
||||
// Code">//GEN-BEGIN:initComponents
|
||||
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||
private void initComponents() {
|
||||
|
||||
nameLabel = new javax.swing.JLabel();
|
||||
nameTextField = new javax.swing.JTextField();
|
||||
isVisible = new javax.swing.JCheckBox();
|
||||
visiableLabel = new javax.swing.JLabel();
|
||||
imageLabel = new javax.swing.JLabel();
|
||||
imageEditor = new com.unicenta.data.gui.JImageEditor();
|
||||
jLabel1 = new javax.swing.JLabel();
|
||||
m_jName = new javax.swing.JTextField();
|
||||
m_jVisible = new javax.swing.JCheckBox();
|
||||
jLabel3 = new javax.swing.JLabel();
|
||||
jLabel4 = new javax.swing.JLabel();
|
||||
m_jImage = new com.unicenta.data.gui.JImageEditor();
|
||||
jButton1 = new javax.swing.JButton();
|
||||
m_jRole = new javax.swing.JComboBox();
|
||||
roleLabel = new javax.swing.JLabel();
|
||||
cardIdTextField = new javax.swing.JTextField();
|
||||
cardIdLabel = new javax.swing.JLabel();
|
||||
passwordLabel = new javax.swing.JLabel();
|
||||
taxIdLabel = new javax.swing.JLabel();
|
||||
taxIdTextField = new javax.swing.JTextField();
|
||||
jLabel2 = new javax.swing.JLabel();
|
||||
m_jcard = new javax.swing.JTextField();
|
||||
jLblCardID = new javax.swing.JLabel();
|
||||
webCBSecurity = new com.alee.laf.combobox.WebComboBox();
|
||||
jLabel6 = new javax.swing.JLabel();
|
||||
|
||||
setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||
setPreferredSize(new java.awt.Dimension(500, 500));
|
||||
|
||||
nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
|
||||
nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
|
||||
nameLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
nameLabel.addMouseListener(new java.awt.event.MouseAdapter() {
|
||||
jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
|
||||
jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
|
||||
jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
|
||||
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
||||
nameLabelMouseClicked(evt);
|
||||
jLabel1MouseClicked(evt);
|
||||
}
|
||||
});
|
||||
add(nameLabel);
|
||||
|
||||
nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
nameTextField.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||
add(nameTextField);
|
||||
m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||
|
||||
isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||
isVisible.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||
add(isVisible);
|
||||
m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||
m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||
|
||||
visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
|
||||
visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
add(visiableLabel);
|
||||
jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
|
||||
jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
|
||||
imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
|
||||
imageLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
add(imageLabel);
|
||||
jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
|
||||
jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
|
||||
imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||
imageEditor.setPreferredSize(new java.awt.Dimension(300, 250));
|
||||
add(imageEditor);
|
||||
m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||
m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
|
||||
|
||||
jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
|
||||
@@ -295,34 +284,101 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
jButton1ActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
add(jButton1);
|
||||
|
||||
m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||
add(m_jRole);
|
||||
|
||||
roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N
|
||||
roleLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
add(roleLabel);
|
||||
jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
|
||||
jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
|
||||
cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||
add(cardIdTextField);
|
||||
m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||
|
||||
cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N
|
||||
cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
add(cardIdLabel);
|
||||
jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
|
||||
jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
|
||||
passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
|
||||
passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
add(passwordLabel);
|
||||
webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
|
||||
webCBSecurity.setSelectedIndex(0);
|
||||
webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
|
||||
webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
|
||||
webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
webCBSecurityActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
taxIdLabel.setText("Tax ID");
|
||||
add(taxIdLabel);
|
||||
add(taxIdTextField);
|
||||
jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
|
||||
jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||
|
||||
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
|
||||
this.setLayout(layout);
|
||||
layout.setHorizontalGroup(
|
||||
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGap(18, 18, 18)
|
||||
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
|
||||
.addContainerGap())
|
||||
);
|
||||
layout.setVerticalGroup(
|
||||
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.addGap(18, 18, 18)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGap(15, 15, 15)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
}// </editor-fold>//GEN-END:initComponents
|
||||
|
||||
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
|
||||
@@ -337,13 +393,15 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
|
||||
private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_webCBSecurityActionPerformed
|
||||
|
||||
|
||||
if(webCBSecurity.getSelectedIndex() == 0){
|
||||
if (JOptionPane.showConfirmDialog(this,
|
||||
AppLocal.getIntString("message.cardnew"),
|
||||
AppLocal.getIntString("title.editor"),
|
||||
JOptionPane.YES_NO_OPTION,
|
||||
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
|
||||
cardIdTextField.setText("C" + StringUtils.getCardNumber());
|
||||
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
|
||||
{
|
||||
m_jcard.setText("C" + StringUtils.getCardNumber());
|
||||
m_Dirty.setDirty(true);
|
||||
}
|
||||
}
|
||||
@@ -353,8 +411,9 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
AppLocal.getIntString("message.cardremove"),
|
||||
AppLocal.getIntString("title.editor"),
|
||||
JOptionPane.YES_NO_OPTION,
|
||||
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
|
||||
cardIdTextField.setText(null);
|
||||
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
|
||||
{
|
||||
m_jcard.setText(null);
|
||||
m_Dirty.setDirty(true);
|
||||
}
|
||||
}
|
||||
@@ -367,8 +426,8 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
|
||||
|
||||
{
|
||||
cardIdTextField.setText(uOWWatch.getibuttonid());
|
||||
cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
|
||||
m_jcard.setText( uOWWatch.getibuttonid() );
|
||||
jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
|
||||
m_Dirty.setDirty(true);
|
||||
}
|
||||
|
||||
@@ -376,7 +435,7 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
|
||||
}//GEN-LAST:event_webCBSecurityActionPerformed
|
||||
|
||||
private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_nameLabelMouseClicked
|
||||
private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
|
||||
if (evt.getClickCount() == 2) {
|
||||
String uuidString = m_oId.toString();
|
||||
StringSelection stringSelection = new StringSelection(uuidString);
|
||||
@@ -386,23 +445,22 @@ public class PeopleView extends JPanel implements EditorRecord {
|
||||
JOptionPane.showMessageDialog(null,
|
||||
AppLocal.getIntString("message.uuidcopy"));
|
||||
}
|
||||
}// GEN-LAST:event_nameLabelMouseClicked
|
||||
}//GEN-LAST:event_jLabel1MouseClicked
|
||||
|
||||
|
||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||
private javax.swing.JLabel cardIdLabel;
|
||||
private javax.swing.JTextField cardIdTextField;
|
||||
private com.unicenta.data.gui.JImageEditor imageEditor;
|
||||
private javax.swing.JLabel imageLabel;
|
||||
private javax.swing.JCheckBox isVisible;
|
||||
private javax.swing.JButton jButton1;
|
||||
private javax.swing.JLabel jLabel1;
|
||||
private javax.swing.JLabel jLabel2;
|
||||
private javax.swing.JLabel jLabel3;
|
||||
private javax.swing.JLabel jLabel4;
|
||||
private javax.swing.JLabel jLabel6;
|
||||
private javax.swing.JLabel jLblCardID;
|
||||
private com.unicenta.data.gui.JImageEditor m_jImage;
|
||||
private javax.swing.JTextField m_jName;
|
||||
private javax.swing.JComboBox m_jRole;
|
||||
private javax.swing.JLabel nameLabel;
|
||||
private javax.swing.JTextField nameTextField;
|
||||
private javax.swing.JLabel passwordLabel;
|
||||
private javax.swing.JLabel roleLabel;
|
||||
private javax.swing.JLabel taxIdLabel;
|
||||
private javax.swing.JTextField taxIdTextField;
|
||||
private javax.swing.JLabel visiableLabel;
|
||||
private javax.swing.JCheckBox m_jVisible;
|
||||
private javax.swing.JTextField m_jcard;
|
||||
private com.alee.laf.combobox.WebComboBox webCBSecurity;
|
||||
// End of variables declaration//GEN-END:variables
|
||||
|
||||
|
||||
@@ -53,6 +53,7 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
|
||||
initPayments("external", new ConfigPaymentPanelEmpty());
|
||||
initPayments("PaymentSense", new ConfigPaymentPanelEmpty());
|
||||
initPayments("Teya", new ConfigPaymentPanelEmpty());
|
||||
initPayments("MediaPayments", new ConfigPaymentPanelEmpty());
|
||||
|
||||
// Lector de tarjetas.
|
||||
jcboCardReader.addItem("Not defined");
|
||||
@@ -91,9 +92,17 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
|
||||
|
||||
jcboCardReader.setSelectedItem(config.getProperty("payment.magcardreader"));
|
||||
jcboPaymentGateway.setSelectedItem(config.getProperty("payment.gateway"));
|
||||
|
||||
String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
|
||||
if ("MediaPayments".equals(gateway)) {
|
||||
urlValue.setText(config.getProperty("media-payments.pdq"));
|
||||
deviceIdValue.setText(config.getProperty("media-payments.api-key"));
|
||||
securityKeyValue.setText(config.getProperty("media-payments.secret"));
|
||||
} else {
|
||||
urlValue.setText(config.getProperty("payment.URL"));
|
||||
deviceIdValue.setText(config.getProperty("payment.device-id"));
|
||||
securityKeyValue.setText(config.getProperty("payment.security-key"));
|
||||
}
|
||||
paymentConfiguration.loadProperties(config);
|
||||
dirty.setDirty(false);
|
||||
}
|
||||
@@ -107,9 +116,17 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
|
||||
|
||||
config.setProperty("payment.magcardreader", comboValue(jcboCardReader.getSelectedItem()));
|
||||
config.setProperty("payment.gateway", comboValue(jcboPaymentGateway.getSelectedItem()));
|
||||
|
||||
String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
|
||||
if ("MediaPayments".equals(gateway)) {
|
||||
config.setProperty("media-payments.pdq", urlValue.getText());
|
||||
config.setProperty("media-payments.api-key", deviceIdValue.getText());
|
||||
config.setProperty("media-payments.secret", securityKeyValue.getText());
|
||||
} else {
|
||||
config.setProperty("payment.URL", urlValue.getText());
|
||||
config.setProperty("payment.device-id", deviceIdValue.getText());
|
||||
config.setProperty("payment.security-key", securityKeyValue.getText());
|
||||
}
|
||||
paymentConfiguration.saveProperties(config);
|
||||
dirty.setDirty(false);
|
||||
}
|
||||
@@ -275,6 +292,9 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
|
||||
paymentConfiguration = paymentsName.get(comboValue(jcboPaymentGateway.getSelectedItem()));
|
||||
|
||||
if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("PaymentSense")) {
|
||||
urlLabel.setText("URL");
|
||||
deviceIdLabel.setText("Device ID");
|
||||
securityKeyLabel.setText("Security Key");
|
||||
emvConfigPanel.setVisible(Boolean.TRUE);
|
||||
jcboCardReader.setSelectedItem("EMV");
|
||||
jcboCardReader.setEnabled(Boolean.FALSE);
|
||||
@@ -285,7 +305,18 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
|
||||
jcboCardReader.setSelectedItem("EMV");
|
||||
jcboCardReader.setEnabled(Boolean.FALSE);
|
||||
}
|
||||
else if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("MediaPayments")) {
|
||||
urlLabel.setText("Terminal ID");
|
||||
deviceIdLabel.setText("API Key");
|
||||
securityKeyLabel.setText("Security Key");
|
||||
emvConfigPanel.setVisible(Boolean.TRUE);
|
||||
jcboCardReader.setSelectedItem("EMV");
|
||||
jcboCardReader.setEnabled(Boolean.FALSE);
|
||||
}
|
||||
else {
|
||||
urlLabel.setText("URL");
|
||||
deviceIdLabel.setText("Device ID");
|
||||
securityKeyLabel.setText("Security Key");
|
||||
emvConfigPanel.setVisible(Boolean.FALSE);
|
||||
jcboCardReader.setEnabled(Boolean.TRUE);
|
||||
}
|
||||
|
||||
@@ -174,8 +174,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
||||
btnPay.setEnabled(true);
|
||||
btnPrePay.setEnabled(true);
|
||||
|
||||
// btnPay.setEnabled(customer.getCurdebt() != null &&
|
||||
// customer.getCurdebt().doubleValue() > 0.0);
|
||||
// btnPay.setEnabled(customer.getCurdebt() != null && customer.getCurdebt().doubleValue() > 0.0);
|
||||
|
||||
}
|
||||
|
||||
@@ -258,14 +257,12 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This method is called from within the constructor to
|
||||
/** This method is called from within the constructor to
|
||||
* initialize the form.
|
||||
* WARNING: Do NOT modify this code. The content of this method is
|
||||
* always regenerated by the Form Editor.
|
||||
*/
|
||||
// <editor-fold defaultstate="collapsed" desc="Generated
|
||||
// Code">//GEN-BEGIN:initComponents
|
||||
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||
private void initComponents() {
|
||||
java.awt.GridBagConstraints gridBagConstraints;
|
||||
|
||||
@@ -513,111 +510,80 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
||||
.addContainerGap()
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)))))
|
||||
.addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250, javax.swing.GroupLayout.PREFERRED_SIZE)))))
|
||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||
.addGap(18, 18, 18)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||
.addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(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)));
|
||||
.addComponent(jLabel6, 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))))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
jPanel1Layout.setVerticalGroup(
|
||||
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtTaxId, 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, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtName, 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, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtCard, 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, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtPrePay, 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)
|
||||
.addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGap(30, 30, 30)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(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))
|
||||
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtMaxdebt, 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))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
|
||||
.addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
add(jPanel1, java.awt.BorderLayout.CENTER);
|
||||
}// </editor-fold>//GEN-END:initComponents
|
||||
|
||||
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
|
||||
|
||||
readCustomer();
|
||||
@@ -646,8 +612,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
||||
editCustomer(c);
|
||||
}
|
||||
} catch (BasicException ex) {
|
||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
|
||||
ex);
|
||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
|
||||
msg.show(this);
|
||||
}
|
||||
}
|
||||
@@ -677,7 +642,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
||||
|
||||
ticket.setPayments(payments);
|
||||
|
||||
ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo());
|
||||
ticket.setUser(app.getAppUserView().getUser().getUserInfo());
|
||||
ticket.setActiveCash(app.getActiveCashIndex());
|
||||
ticket.setDate(new Date());
|
||||
ticket.setCustomer(customerext);
|
||||
@@ -689,6 +654,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
||||
msg.show(this);
|
||||
}
|
||||
|
||||
|
||||
// reload customer
|
||||
CustomerInfoExt c;
|
||||
try {
|
||||
@@ -701,8 +667,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
||||
}
|
||||
} catch (BasicException ex) {
|
||||
c = null;
|
||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
|
||||
ex);
|
||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
|
||||
msg.show(this);
|
||||
}
|
||||
|
||||
@@ -755,7 +720,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
||||
|
||||
ticket.setPayments(payments);
|
||||
|
||||
ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo());
|
||||
ticket.setUser(app.getAppUserView().getUser().getUserInfo());
|
||||
ticket.setActiveCash(app.getActiveCashIndex());
|
||||
ticket.setDate(new Date());
|
||||
ticket.setCustomer(customerext);
|
||||
@@ -771,16 +736,14 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
||||
try {
|
||||
c = dlsales.loadCustomerExt(customerext.getId());
|
||||
if (c == null) {
|
||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING,
|
||||
AppLocal.getIntString("message.cannotfindcustomer"));
|
||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"));
|
||||
msg.show(this);
|
||||
} else {
|
||||
editCustomer(c);
|
||||
}
|
||||
} catch (BasicException ex) {
|
||||
c = null;
|
||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
|
||||
ex);
|
||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
|
||||
msg.show(this);
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -40,10 +40,6 @@
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Component id="m_jVoucher" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
@@ -87,9 +83,7 @@
|
||||
<Component id="webLblCustomer" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="webLblcustomerName" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace min="-2" pref="33" max="-2" attributes="0"/>
|
||||
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" pref="241" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@@ -166,43 +160,43 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="com.alee.laf.label.WebLabel" name="webLblCustomer">
|
||||
<Component class="javax.swing.JLabel" name="webLblCustomer">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString("label.customer")"/>
|
||||
</Property>
|
||||
<Property name="toolTipText" type="java.lang.String" value=""/>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="18" style="1"/>
|
||||
</Property>
|
||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||
<Dimension value="[100, 30]"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="com.alee.laf.label.WebLabel" name="webLblcustomerName">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString("label.customer")"/>
|
||||
</Property>
|
||||
<Property name="toolTipText" type="java.lang.String" value=""/>
|
||||
<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="[100, 30]"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="com.alee.laf.label.WebLabel" name="voucherStatus">
|
||||
<Component class="javax.swing.JLabel" name="webLblcustomerName">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
</Property>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString("label.customer")"/>
|
||||
</Property>
|
||||
<Property name="toolTipText" type="java.lang.String" value=""/>
|
||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||
<Dimension value="[100, 30]"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="voucherStatus">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
</Property>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="pos_messages.properties" key="label.voucherStatus" replaceFormat="AppLocal.getIntString("label.voucherStatus")"/>
|
||||
</Property>
|
||||
<Property name="toolTipText" type="java.lang.String" value=""/>
|
||||
<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="[100, 30]"/>
|
||||
</Property>
|
||||
@@ -224,14 +218,6 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JButton" name="jButton1">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="jButton1"/>
|
||||
</Properties>
|
||||
<Events>
|
||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
|
||||
</Events>
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Container>
|
||||
<Container class="javax.swing.JPanel" name="jPanel11">
|
||||
|
||||
@@ -191,11 +191,10 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
|
||||
m_jVoucher = new javax.swing.JComboBox();
|
||||
jLabel1 = new javax.swing.JLabel();
|
||||
m_jMoneyEuros = new javax.swing.JLabel();
|
||||
webLblCustomer = new com.alee.laf.label.WebLabel();
|
||||
webLblcustomerName = new com.alee.laf.label.WebLabel();
|
||||
voucherStatus = new com.alee.laf.label.WebLabel();
|
||||
webLblCustomer = new javax.swing.JLabel();
|
||||
webLblcustomerName = new javax.swing.JLabel();
|
||||
voucherStatus = new javax.swing.JLabel();
|
||||
jLabel6 = new javax.swing.JLabel();
|
||||
jButton1 = new javax.swing.JButton();
|
||||
jPanel11 = new javax.swing.JPanel();
|
||||
jPanel12 = new javax.swing.JPanel();
|
||||
m_jKeys = new com.unicenta.editor.JEditorKeys();
|
||||
@@ -248,13 +247,6 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
|
||||
jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
|
||||
jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
|
||||
jButton1.setText("jButton1");
|
||||
jButton1.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
jButton1ActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
|
||||
jPanel4.setLayout(jPanel4Layout);
|
||||
jPanel4Layout.setHorizontalGroup(
|
||||
@@ -270,10 +262,7 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
|
||||
.addContainerGap()
|
||||
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGroup(jPanel4Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(jButton1)))
|
||||
.addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addGap(0, 0, Short.MAX_VALUE))
|
||||
.addGroup(jPanel4Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
@@ -306,9 +295,7 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
|
||||
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGap(33, 33, 33)
|
||||
.addComponent(jButton1)
|
||||
.addContainerGap())
|
||||
.addGap(241, 241, 241))
|
||||
);
|
||||
|
||||
add(jPanel4, java.awt.BorderLayout.CENTER);
|
||||
@@ -365,13 +352,8 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
|
||||
}
|
||||
}//GEN-LAST:event_m_jVoucherActionPerformed
|
||||
|
||||
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
|
||||
|
||||
}//GEN-LAST:event_jButton1ActionPerformed
|
||||
|
||||
|
||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||
private javax.swing.JButton jButton1;
|
||||
private javax.swing.JLabel jLabel1;
|
||||
private javax.swing.JLabel jLabel5;
|
||||
private javax.swing.JLabel jLabel6;
|
||||
@@ -383,9 +365,9 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
|
||||
private javax.swing.JLabel m_jMoneyEuros;
|
||||
private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
|
||||
private javax.swing.JComboBox m_jVoucher;
|
||||
private com.alee.laf.label.WebLabel voucherStatus;
|
||||
private com.alee.laf.label.WebLabel webLblCustomer;
|
||||
private com.alee.laf.label.WebLabel webLblcustomerName;
|
||||
private javax.swing.JLabel voucherStatus;
|
||||
private javax.swing.JLabel webLblCustomer;
|
||||
private javax.swing.JLabel webLblcustomerName;
|
||||
// End of variables declaration//GEN-END:variables
|
||||
|
||||
}
|
||||
|
||||
@@ -41,6 +41,8 @@ public class PaymentGatewayFac {
|
||||
return new PaymentGatewayPaymentSense();
|
||||
case "Teya":
|
||||
return new PaymentGatewayTeya();
|
||||
case "MediaPayments":
|
||||
return new PaymentGatewayMediaPayments();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
// uniCenta oPOS - Touch Friendly Point Of Sale
|
||||
// Copyright (c) 2009-2018 uniCenta & previous Openbravo POS works
|
||||
// https://unicenta.com
|
||||
//
|
||||
// This file is part of uniCenta oPOS
|
||||
//
|
||||
// uniCenta oPOS is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// uniCenta oPOS is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with uniCenta oPOS. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
package com.unicenta.pos.payment;
|
||||
|
||||
import com.unicenta.plugins.Application;
|
||||
import com.unicenta.plugins.common.AppContext;
|
||||
import com.unicenta.pos.util.RoundUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.ArrayList;
|
||||
|
||||
@Slf4j
|
||||
public class PaymentGatewayMediaPayments implements PaymentGateway {
|
||||
|
||||
public PaymentGatewayMediaPayments() {
|
||||
}
|
||||
|
||||
Window getPaymentWindow(double amount) {
|
||||
if (amount > 0) {
|
||||
ArrayList<JPaymentSelectReceipt> paymentWindows = new ArrayList<>();
|
||||
for (Window window : Window.getWindows()) {
|
||||
if (window instanceof JPaymentSelectReceipt) {
|
||||
paymentWindows.add((JPaymentSelectReceipt) window);
|
||||
}
|
||||
}
|
||||
return paymentWindows.get(paymentWindows.size() - 1);
|
||||
} else {
|
||||
ArrayList<JPaymentSelectRefund> paymentWindows = new ArrayList<>();
|
||||
for (Window window : Window.getWindows()) {
|
||||
if (window instanceof JPaymentSelectRefund) {
|
||||
paymentWindows.add((JPaymentSelectRefund) window);
|
||||
}
|
||||
}
|
||||
return paymentWindows.get(paymentWindows.size() - 1);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(PaymentInfoMagcard payinfo) {
|
||||
|
||||
int timer = 0;
|
||||
int timeout = 180;
|
||||
|
||||
double roundedValue = RoundUtils.round(payinfo.getTotal());
|
||||
new Application().mediaPaymentsTransaction(roundedValue, getPaymentWindow(roundedValue),
|
||||
payinfo.getTransactionID().length() > 12 ? payinfo.getTransactionID() : null);
|
||||
|
||||
while (AppContext.getIsProcessing() == null || AppContext.getIsProcessing()) {
|
||||
try {
|
||||
log.info("uniCenta-oPos: waiting for payment to complete ....");
|
||||
Thread.sleep(1000);
|
||||
timer += 1;
|
||||
if (timer > timeout)
|
||||
break;
|
||||
} catch (InterruptedException e) {
|
||||
log.error(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
if (AppContext.getMediaPaymentsPaymentResult() == null) {
|
||||
payinfo.paymentError("Transaction Error! Please try again", "No Response");
|
||||
} else if ("APPROVED".equals(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus())) {
|
||||
payinfo.setCardName(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getCard().getType());
|
||||
payinfo
|
||||
.setVerification(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getVerificationMethod());
|
||||
payinfo.setChipAndPin(true);
|
||||
payinfo.paymentOK(
|
||||
AppContext.getMediaPaymentsPaymentResult().getAdditionalInformation().getRequestId(),
|
||||
AppContext.getMediaPaymentsPaymentResult().getTransactionDetails().getId(),
|
||||
AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus());
|
||||
} else {
|
||||
String errorMsg = AppContext.getMediaPaymentsPaymentResult().getErrorMessage();
|
||||
if (errorMsg == null) {
|
||||
errorMsg = AppContext.getMediaPaymentsPaymentResult().getMessage();
|
||||
}
|
||||
payinfo.paymentError("Transaction Error! Please try again", errorMsg);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -64,10 +64,11 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
if (Id == null) {
|
||||
return null;
|
||||
} else {
|
||||
Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?",
|
||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
|
||||
Datas.SERIALIZABLE }))
|
||||
.find(Id);
|
||||
Object[]record = (Object[]) new StaticSentence(s
|
||||
, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?"
|
||||
, SerializerWriteString.INSTANCE
|
||||
, new SerializerReadBasic(new Datas[] {
|
||||
Datas.SERIALIZABLE})).find(Id);
|
||||
return record == null ? null : (TicketInfo) record[0];
|
||||
}
|
||||
}
|
||||
@@ -83,34 +84,32 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
if (pickupId == null) {
|
||||
return null;
|
||||
} else {
|
||||
Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?",
|
||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
|
||||
Datas.SERIALIZABLE }))
|
||||
.find(pickupId);
|
||||
Object[]record = (Object[]) new StaticSentence(s
|
||||
, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?"
|
||||
, SerializerWriteString.INSTANCE
|
||||
, new SerializerReadBasic(new Datas[] {
|
||||
Datas.SERIALIZABLE})).find(pickupId);
|
||||
return record == null ? null : (TicketInfo) record[0];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* JG Dec 14 Administrator and Manager Roles always have access to ALL
|
||||
* SHAREDtickets
|
||||
*
|
||||
* JG Dec 14 Administrator and Manager Roles always have access to ALL SHAREDtickets
|
||||
* @return
|
||||
* @throws BasicException
|
||||
*/
|
||||
public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
|
||||
|
||||
return (List<SharedTicketInfo>) new StaticSentence(s
|
||||
// , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets
|
||||
// ORDER BY ID"
|
||||
// , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets ORDER BY ID"
|
||||
, "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
|
||||
+ "FROM sharedtickets ORDER BY PICKUPID",
|
||||
null, new SerializerReadClass(SharedTicketInfo.class)).list();
|
||||
+ "FROM sharedtickets ORDER BY PICKUPID"
|
||||
, null
|
||||
, new SerializerReadClass(SharedTicketInfo.class)).list();
|
||||
}
|
||||
|
||||
/**
|
||||
* Return only current APPUSER SHAREDtickets
|
||||
*
|
||||
* @param appuser
|
||||
* @return
|
||||
* @throws BasicException
|
||||
@@ -120,13 +119,14 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
+ "FROM sharedtickets "
|
||||
+ "WHERE APPUSER =\""+ appuser +"\" ORDER BY PICKUPID";
|
||||
|
||||
return (List<SharedTicketInfo>) new StaticSentence(s, sql, null, new SerializerReadClass(SharedTicketInfo.class))
|
||||
.list();
|
||||
return (List<SharedTicketInfo>) new StaticSentence(s
|
||||
, sql
|
||||
, null
|
||||
, new SerializerReadClass(SharedTicketInfo.class)).list();
|
||||
}
|
||||
|
||||
/**
|
||||
* For Standard View
|
||||
*
|
||||
* @param id
|
||||
* @param ticket
|
||||
* @param pickupid
|
||||
@@ -138,7 +138,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
id,
|
||||
ticket.getName(),
|
||||
ticket,
|
||||
ticket.getUserInfo().getId(),
|
||||
ticket.getUser().getId(),
|
||||
pickupid
|
||||
|
||||
};
|
||||
@@ -151,13 +151,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
Datas.INT
|
||||
|
||||
};
|
||||
new PreparedSentence(s, "INSERT INTO sharedtickets ("
|
||||
new PreparedSentence(s
|
||||
, "INSERT INTO sharedtickets ("
|
||||
+ "ID, "
|
||||
+ "NAME, "
|
||||
+ "CONTENT, "
|
||||
+ "APPUSER, "
|
||||
+ "PICKUPID) "
|
||||
+ "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
|
||||
+ "VALUES (?, ?, ?, ?, ?)"
|
||||
, new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -173,7 +175,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
id,
|
||||
ticket.getName(),
|
||||
ticket,
|
||||
ticket.getUserInfo().getId(),
|
||||
ticket.getUser().getId(),
|
||||
pickupid
|
||||
};
|
||||
Datas[] datas = new Datas[] {
|
||||
@@ -183,16 +185,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
Datas.STRING,
|
||||
Datas.INT
|
||||
};
|
||||
new PreparedSentence(s, "UPDATE sharedtickets SET "
|
||||
new PreparedSentence(s
|
||||
, "UPDATE sharedtickets SET "
|
||||
+ "NAME = ?, "
|
||||
+ "CONTENT = ?, "
|
||||
+ "APPUSER = ?, "
|
||||
+ "PICKUPID = ? "
|
||||
+ "WHERE ID = ?",
|
||||
new SerializerWriteBasicExt(datas,
|
||||
+ "WHERE ID = ?"
|
||||
, new SerializerWriteBasicExt(datas,
|
||||
new int[] {
|
||||
1, 2, 3, 4, 0 }))
|
||||
.exec(values);
|
||||
1, 2, 3, 4, 0})).exec(values);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -219,17 +221,18 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
Datas.SERIALIZABLE,
|
||||
Datas.INT
|
||||
};
|
||||
new PreparedSentence(s, "UPDATE sharedtickets SET "
|
||||
new PreparedSentence(s
|
||||
, "UPDATE sharedtickets SET "
|
||||
+ "NAME = ?, "
|
||||
+ "CONTENT = ?, "
|
||||
+ "PICKUPID = ? "
|
||||
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 2, 3, 0 })).exec(values);
|
||||
+ "WHERE ID = ?"
|
||||
, new SerializerWriteBasicExt(datas, new int[] {1, 2, 3, 0})).exec(values);
|
||||
}
|
||||
|
||||
/**
|
||||
* In place for multi-purposing like containing data from elsewhere and/or
|
||||
* using Place and User for Notifications
|
||||
*
|
||||
* @param id
|
||||
* @param locked
|
||||
* @throws BasicException
|
||||
@@ -244,15 +247,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
Datas.STRING,
|
||||
Datas.STRING
|
||||
};
|
||||
new PreparedSentence(s, "UPDATE sharedtickets SET "
|
||||
new PreparedSentence(s
|
||||
, "UPDATE sharedtickets SET "
|
||||
+ "LOCKED = ? "
|
||||
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
|
||||
+ "WHERE ID = ?"
|
||||
, new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
|
||||
}
|
||||
|
||||
/**
|
||||
* In place for multi-purposing like flushing locks from elsewhere and/or
|
||||
* using Place and User for Notifications
|
||||
*
|
||||
* @param id
|
||||
* @param unlocked
|
||||
* @throws BasicException
|
||||
@@ -267,14 +271,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
Datas.STRING,
|
||||
Datas.STRING
|
||||
};
|
||||
new PreparedSentence(s, "UPDATE sharedtickets SET "
|
||||
new PreparedSentence(s
|
||||
, "UPDATE sharedtickets SET "
|
||||
+ "LOCKED = ? "
|
||||
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
|
||||
+ "WHERE ID = ?"
|
||||
, new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
|
||||
}
|
||||
|
||||
/**
|
||||
* For Restaurant View
|
||||
*
|
||||
* @param id
|
||||
* @param ticket
|
||||
* @param pickupid
|
||||
@@ -289,7 +294,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
id,
|
||||
ticket.getName(),
|
||||
ticket,
|
||||
ticket.getUserInfo(),
|
||||
ticket.getUser(),
|
||||
ticket.getPickupId(),
|
||||
ticket.getHost()
|
||||
};
|
||||
@@ -302,13 +307,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
Datas.INT
|
||||
|
||||
};
|
||||
new PreparedSentence(s, "INSERT INTO sharedtickets ("
|
||||
new PreparedSentence(s
|
||||
, "INSERT INTO sharedtickets ("
|
||||
+ "ID, "
|
||||
+ "NAME, "
|
||||
+ "CONTENT, "
|
||||
+ "APPUSER, "
|
||||
+ "PICKUPID) "
|
||||
+ "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
|
||||
+ "VALUES (?, ?, ?, ?, ?)"
|
||||
, new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -318,7 +325,9 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
*/
|
||||
public final void deleteSharedTicket(final String id) throws BasicException {
|
||||
|
||||
new StaticSentence(s, "DELETE FROM sharedtickets WHERE ID = ?", SerializerWriteString.INSTANCE).exec(id);
|
||||
new StaticSentence(s
|
||||
, "DELETE FROM sharedtickets WHERE ID = ?"
|
||||
, SerializerWriteString.INSTANCE).exec(id);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -332,15 +341,20 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
if (Id == null) {
|
||||
return null;
|
||||
} else {
|
||||
Object[] record = (Object[]) new StaticSentence(s, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?",
|
||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.INT })).find(Id);
|
||||
Object[]record = (Object[]) new StaticSentence(s
|
||||
, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?"
|
||||
, SerializerWriteString.INSTANCE
|
||||
, new SerializerReadBasic(new Datas[] {Datas.INT})).find(Id);
|
||||
return record == null ? 0 : (Integer)record[0];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public final String getUserId(final String id) throws BasicException {
|
||||
Object[] userID = (Object[]) new StaticSentence(s, "SELECT APPUSER FROM sharedtickets WHERE ID = ?",
|
||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.STRING })).find(id);
|
||||
Object[] userID = (Object []) new StaticSentence(s
|
||||
, "SELECT APPUSER FROM sharedtickets WHERE ID = ?"
|
||||
, SerializerWriteString.INSTANCE
|
||||
, new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
|
||||
if( userID == null ) {
|
||||
return null;
|
||||
} else {
|
||||
@@ -349,16 +363,20 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
||||
}
|
||||
|
||||
public final String getLockState(final String id, String lockState) throws BasicException {
|
||||
Object[] state = (Object[]) new StaticSentence(s, "SELECT LOCKED FROM sharedtickets WHERE ID = ?",
|
||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
|
||||
Object[] state = (Object[]) new StaticSentence(s
|
||||
, "SELECT LOCKED FROM sharedtickets WHERE ID = ?"
|
||||
, SerializerWriteString.INSTANCE
|
||||
, new SerializerReadBasic(new Datas[] {
|
||||
Datas.STRING
|
||||
})).find(id);
|
||||
return (String) state[0];
|
||||
}
|
||||
|
||||
public final String getServer(final String id, String user) throws BasicException {
|
||||
Object[] server = (Object[]) new StaticSentence(s, "SELECT appuser FROM sharedtickets WHERE ID = ?",
|
||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
|
||||
Object[] server = (Object[]) new StaticSentence(s
|
||||
, "SELECT appuser FROM sharedtickets WHERE ID = ?"
|
||||
, SerializerWriteString.INSTANCE
|
||||
, new SerializerReadBasic(new Datas[] {
|
||||
Datas.STRING
|
||||
})).find(id);
|
||||
return (String) server[0];
|
||||
|
||||
@@ -74,6 +74,7 @@ import java.util.*;
|
||||
|
||||
import static java.awt.Window.getWindows;
|
||||
|
||||
|
||||
/**
|
||||
* @author JG uniCenta
|
||||
*/
|
||||
@@ -154,6 +155,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
private Integer oCount = 0;
|
||||
private Boolean pinOK;
|
||||
|
||||
|
||||
/**
|
||||
* Creates new form JTicketView
|
||||
*/
|
||||
@@ -180,8 +182,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
dlCustomers = (DataLogicCustomers) m_App.getBean("com.unicenta.pos.customers.DataLogicCustomers");
|
||||
dlReceipts = (DataLogicReceipts) app.getBean("com.unicenta.pos.sales.DataLogicReceipts");
|
||||
|
||||
/*
|
||||
* uniCenta Feb 2018
|
||||
|
||||
/* uniCenta Feb 2018
|
||||
* Changed for 4.3
|
||||
* Set up main toolbar area with two rows to add cater for additional scripts
|
||||
* else over-crowding and some dynamic buttons off screen/not visible
|
||||
@@ -189,8 +191,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
* Resources>Menu.Root
|
||||
*/
|
||||
|
||||
// Set Configuration>General>Tickets toolbar simple : standard : restaurant
|
||||
// option
|
||||
// Set Configuration>General>Tickets toolbar simple : standard : restaurant option
|
||||
m_ticketsbag = getJTicketsBag();
|
||||
m_jPanelBag.add(m_ticketsbag.getBagComponent(), BorderLayout.LINE_START);
|
||||
add(m_ticketsbag.getNullComponent(), "null");
|
||||
@@ -326,6 +327,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -510,7 +512,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
m_oTicketExt = oTicketExt;
|
||||
|
||||
if (m_oTicket != null) {
|
||||
m_oTicket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
|
||||
m_oTicket.setUser(m_App.getAppUserView().getUser().getUserInfo());
|
||||
m_oTicket.setActiveCash(m_App.getActiveCashIndex());
|
||||
m_oTicket.setDate(new Date());
|
||||
|
||||
@@ -816,8 +818,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
|
||||
// if (m_App.getProperties().getProperty("override.check").equals("true")) {
|
||||
if (!m_oTicket.getLine(i).getUpdated()) {
|
||||
JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.deletelinesent"),
|
||||
AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
|
||||
JOptionPane.showMessageDialog(this
|
||||
, AppLocal.getIntString("message.deletelinesent")
|
||||
, AppLocal.getIntString("label.deleteline")
|
||||
, JOptionPane.WARNING_MESSAGE);
|
||||
} else {
|
||||
if (executeEventAndRefresh("ticket.removeline", new ScriptArg("index", i)) == null) {
|
||||
String ticketID = Integer.toString(m_oTicket.getTicketId());
|
||||
@@ -831,7 +835,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
m_oTicket.getLine(i).getProductID(),
|
||||
m_oTicket.getLine(i).getProductName(),
|
||||
m_oTicket.getLine(i).getMultiply()
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
if (m_oTicket.getLine(i).isProductCom()) {
|
||||
m_oTicket.removeLine(i);
|
||||
@@ -841,8 +846,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
|
||||
if (m_App.getAppUserView().getUser().hasPermission("sales.DeleteLines")) {
|
||||
int input = JOptionPane.showConfirmDialog(this,
|
||||
AppLocal.getIntString("message.deletelineyes"), AppLocal.getIntString("label.deleteline"),
|
||||
JOptionPane.YES_NO_OPTION);
|
||||
AppLocal.getIntString("message.deletelineyes")
|
||||
, AppLocal.getIntString("label.deleteline"), JOptionPane.YES_NO_OPTION);
|
||||
|
||||
if (input == 0) {
|
||||
m_oTicket.removeLine(i);
|
||||
@@ -850,8 +855,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
}
|
||||
} else {
|
||||
JOptionPane.showMessageDialog(this,
|
||||
AppLocal.getIntString("message.deletelineno"), AppLocal.getIntString("label.deleteline"),
|
||||
JOptionPane.WARNING_MESSAGE);
|
||||
AppLocal.getIntString("message.deletelineno")
|
||||
, AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
|
||||
}
|
||||
} else {
|
||||
m_oTicket.removeLine(i);
|
||||
@@ -906,6 +911,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
return dValue / (1.0 + dTaxRate);
|
||||
}
|
||||
|
||||
|
||||
private double getInputValue() {
|
||||
try {
|
||||
return Double.parseDouble(m_jPrice.getText());
|
||||
@@ -1067,9 +1073,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
} else if (sCode.startsWith(";")) {
|
||||
stateToZero();
|
||||
|
||||
|
||||
// START OF BARCODE PARSING
|
||||
/*
|
||||
* This block is deliberately verbose and is base for future scanner handling
|
||||
/* This block is deliberately verbose and is base for future scanner handling
|
||||
* Some scanners inject a CR+LF... some don't...
|
||||
* stateTransition() must allow for this as these add characters to .length()
|
||||
* First 3 digits are GS1 CountryCode OR Retailer internal use
|
||||
@@ -1163,8 +1169,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
}
|
||||
|
||||
TaxInfo tax = taxeslogic // get the TaxRate for the product
|
||||
.getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer()); // calculate if ticket has a
|
||||
// Customer
|
||||
.getTaxInfo(oProduct.getTaxCategoryID()
|
||||
, m_oTicket.getCustomer()); // calculate if ticket has a Customer
|
||||
|
||||
switch (sVariableTypePrefix) {
|
||||
// PRICE - Assign var's
|
||||
@@ -1173,28 +1179,32 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
/ (1.0 + tax.getRate()); // selling price with tax
|
||||
dUnits = (Double.parseDouble(sVariableNum)
|
||||
/ 100) / oProduct.getPriceSellTax(tax); // Units as proportion of selling price
|
||||
oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell())); // push to screen
|
||||
oProduct.setProperty("product.price"
|
||||
, Double.toString(oProduct.getPriceSell())); // push to screen
|
||||
break;
|
||||
case "20": // as above
|
||||
dPriceSell = oProduct.getPriceSellTax(tax)
|
||||
/ (1.0 + tax.getRate());
|
||||
dUnits = (Double.parseDouble(sVariableNum)
|
||||
/ 100) / oProduct.getPriceSellTax(tax);
|
||||
oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSellTax(tax)));
|
||||
oProduct.setProperty("product.price"
|
||||
, Double.toString(oProduct.getPriceSellTax(tax)));
|
||||
break;
|
||||
case "21":
|
||||
dPriceSell = oProduct.getPriceSellTax(tax)
|
||||
/ (1.0 + tax.getRate());
|
||||
dUnits = (Double.parseDouble(sVariableNum)
|
||||
/ 10) / oProduct.getPriceSellTax(tax);
|
||||
oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
|
||||
oProduct.setProperty("product.price"
|
||||
, Double.toString(oProduct.getPriceSell()));
|
||||
break;
|
||||
case "22":
|
||||
dPriceSell = oProduct.getPriceSellTax(tax)
|
||||
/ (1.0 + tax.getRate());
|
||||
dUnits = (Double.parseDouble(sVariableNum)
|
||||
/ 1) / oProduct.getPriceSellTax(tax);
|
||||
oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
|
||||
oProduct.setProperty("product.price"
|
||||
, Double.toString(oProduct.getPriceSell()));
|
||||
break;
|
||||
|
||||
// WEIGHT - Assign variable to Unit
|
||||
@@ -1202,22 +1212,28 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
weight = Double.parseDouble(sVariableNum)
|
||||
/ 1000; // 3 decimals = 01.049 kg
|
||||
dUnits = weight; // which represents 1gramme Units
|
||||
oProduct.setProperty("product.weight", Double.toString(weight));
|
||||
oProduct.setProperty("product.price", Double.toString(dPriceSell));
|
||||
oProduct.setProperty("product.weight"
|
||||
, Double.toString(weight));
|
||||
oProduct.setProperty("product.price"
|
||||
, Double.toString(dPriceSell));
|
||||
break;
|
||||
case "24":
|
||||
weight = Double.parseDouble(sVariableNum)
|
||||
/ 100; // 2 decimals = 010.49 kg
|
||||
dUnits = weight; // which represents 10gramme Units
|
||||
oProduct.setProperty("product.weight", Double.toString(weight));
|
||||
oProduct.setProperty("product.price", Double.toString(dPriceSell));
|
||||
oProduct.setProperty("product.weight"
|
||||
, Double.toString(weight));
|
||||
oProduct.setProperty("product.price"
|
||||
, Double.toString(dPriceSell));
|
||||
break;
|
||||
case "25":
|
||||
weight = Double.parseDouble(sVariableNum)
|
||||
/ 10; // 1 decimal = 0104.9 kg
|
||||
dUnits = weight; // which represents 100gramme Units
|
||||
oProduct.setProperty("product.weight", Double.toString(weight));
|
||||
oProduct.setProperty("product.price", Double.toString(dPriceSell));
|
||||
oProduct.setProperty("product.weight"
|
||||
, Double.toString(weight));
|
||||
oProduct.setProperty("product.price"
|
||||
, Double.toString(dPriceSell));
|
||||
break;
|
||||
|
||||
/*
|
||||
@@ -1225,25 +1241,27 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
* Use this section to add more case statements but these are not mandatory
|
||||
* If you have your own internal or other barcode schema then...
|
||||
* Example:
|
||||
* case "28":
|
||||
* {
|
||||
* // price has tax. Remove it from sPriceSell
|
||||
* TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(),
|
||||
* m_oTicket.getCustomer());
|
||||
* dPriceSell /= (1.0 + tax.getRate());
|
||||
* oProduct.setProperty("product.price", Double.toString(dPriceSell));
|
||||
* weight = -1.0;
|
||||
* break;
|
||||
case "28":
|
||||
{
|
||||
// price has tax. Remove it from sPriceSell
|
||||
TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
|
||||
dPriceSell /= (1.0 + tax.getRate());
|
||||
oProduct.setProperty("product.price", Double.toString(dPriceSell));
|
||||
weight = -1.0;
|
||||
break;
|
||||
*/
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (m_jaddtax.isSelected()) {
|
||||
addTicketLine(oProduct, dUnits // weight
|
||||
addTicketLine(oProduct
|
||||
, dUnits //weight
|
||||
, dPriceSell = oProduct.getPriceSellTax(tax));
|
||||
} else {
|
||||
addTicketLine(oProduct, dUnits, dPriceSell);
|
||||
addTicketLine(oProduct
|
||||
, dUnits
|
||||
, dPriceSell);
|
||||
}
|
||||
}
|
||||
} catch (BasicException eData) {
|
||||
@@ -1252,15 +1270,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
}
|
||||
|
||||
// UPC-A
|
||||
/*
|
||||
* Note: if begins 02 then its a standard
|
||||
* // UPC-A max value limitation is 4 digit price
|
||||
* // UPC-A Extended uses State digit to give 5 digit price
|
||||
* // uniCenta oPOS does not support UPC-A Extended at this time
|
||||
* // Identifier Prod State Cost CheckCode
|
||||
* // I PPPPP S CCCC K
|
||||
* // 1 23456 7 8901 2
|
||||
*
|
||||
/* Note: if begins 02 then its a standard
|
||||
// UPC-A max value limitation is 4 digit price
|
||||
// UPC-A Extended uses State digit to give 5 digit price
|
||||
// uniCenta oPOS does not support UPC-A Extended at this time
|
||||
// Identifier Prod State Cost CheckCode
|
||||
// I PPPPP S CCCC K
|
||||
// 1 23456 7 8901 2
|
||||
|
||||
* 0 = Standard UPC number (must have a zero to do zero-suppressed numbers)
|
||||
* 1 = Reserved
|
||||
* 2 = Random-weight items (fruits, vegetables, meats, etc.)
|
||||
@@ -1278,7 +1295,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
&& (sCode.length() == 12)) {
|
||||
|
||||
try {
|
||||
ProductInfoExt oProduct = dlSales.getProductInfoByUShortCode(sCode); // Return only UPC product
|
||||
ProductInfoExt oProduct
|
||||
= dlSales.getProductInfoByUShortCode(sCode); // Return only UPC product
|
||||
|
||||
if (oProduct == null) {
|
||||
Toolkit.getDefaultToolkit().beep();
|
||||
@@ -1295,7 +1313,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
String sVariableNum = sCode.substring(7, 11); // grab the value from the code only using 4 digit price
|
||||
|
||||
TaxInfo tax = taxeslogic // get the TaxRate for the product
|
||||
.getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
|
||||
.getTaxInfo(oProduct.getTaxCategoryID()
|
||||
, m_oTicket.getCustomer());
|
||||
|
||||
if (oProduct.getPriceSell() != 0.0) { // we have a weight barcode
|
||||
weight = Double.parseDouble(sVariableNum) / 100; // 2 decimals (e.g. 10.49 kg)
|
||||
@@ -1317,9 +1336,13 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
}
|
||||
|
||||
if (m_jaddtax.isSelected()) {
|
||||
addTicketLine(oProduct, dUnits, dPriceSell);
|
||||
addTicketLine(oProduct
|
||||
, dUnits
|
||||
, dPriceSell);
|
||||
} else {
|
||||
addTicketLine(oProduct, dUnits, dPriceSell / (1.0 + tax.getRate()));
|
||||
addTicketLine(oProduct
|
||||
, dUnits
|
||||
, dPriceSell / (1.0 + tax.getRate()));
|
||||
}
|
||||
}
|
||||
} catch (BasicException eData) {
|
||||
@@ -1372,6 +1395,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
m_jPrice.setText(setTempjPrice(m_jPrice.getText() + cTrans));
|
||||
}
|
||||
|
||||
|
||||
} else if (cTrans == '.'
|
||||
&& m_iNumberStatus == NUMBER_INPUTZERO && !priceWith00) {
|
||||
m_jPrice.setText("0.");
|
||||
@@ -1761,6 +1785,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private Window getActiveWindow() {
|
||||
for (Window window: getWindows()) {
|
||||
if (window instanceof JRootFrame) {
|
||||
@@ -1809,7 +1834,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
|
||||
ticket.setPayments(paymentdialog.getSelectedPayments());
|
||||
|
||||
ticket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
|
||||
ticket.setUser(m_App.getAppUserView().getUser().getUserInfo());
|
||||
ticket.setActiveCash(m_App.getActiveCashIndex());
|
||||
ticket.setDate(new Date());
|
||||
|
||||
@@ -1824,22 +1849,17 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
m_config.setLastTicket(lastTicketNumber, lastTicketType);
|
||||
|
||||
} catch (BasicException eData) {
|
||||
MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"),
|
||||
eData);
|
||||
MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"), eData);
|
||||
msg.show(this);
|
||||
} catch (IOException ex) {
|
||||
log.error(ex.getMessage());
|
||||
}
|
||||
|
||||
if (m_config.getProperty("till.digital-receipt") != null
|
||||
&& m_config.getProperty("till.digital-receipt").equals("true")) {
|
||||
if (m_config.getProperty("till.digital-receipt") != null && m_config.getProperty("till.digital-receipt").equals("true")){
|
||||
log.debug("Send digital receipt");
|
||||
String xml = dlSystem.getResourceAsXML("Printer.Ticket");
|
||||
new Application().sendReceipt(ticket, xml, getActiveWindow());
|
||||
}
|
||||
// this is where we trigger the efr integration
|
||||
//
|
||||
//
|
||||
|
||||
executeEvent(ticket, ticketext, "ticket.close",
|
||||
new ScriptArg("print", paymentdialog.isPrintSelected()));
|
||||
@@ -1853,8 +1873,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
|
||||
if ("restaurant".equals(m_App.getProperties()
|
||||
.getProperty("machine.ticketsbag")) && !ticket.getOldTicket()) {
|
||||
/*
|
||||
* Deliberately Explicit to allow for reassignments - future
|
||||
/* Deliberately Explicit to allow for reassignments - future
|
||||
* even though we could do a single SQL statment sweep for reset
|
||||
*/
|
||||
restDB.clearCustomerNameInTable(ticketext.toString());
|
||||
@@ -1913,6 +1932,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
return (tmpPickupId);
|
||||
}
|
||||
|
||||
|
||||
private void printTicket(String sresourcename, TicketInfo ticket, Object ticketext) {
|
||||
|
||||
String sresource = dlSystem.getResourceAsXML(sresourcename);
|
||||
@@ -2012,6 +2032,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Map reportparams = new HashMap();
|
||||
|
||||
try {
|
||||
@@ -2024,8 +2045,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
reportfields.put("TICKET", ticket);
|
||||
reportfields.put("PLACE", ticketext);
|
||||
|
||||
JasperPrint jp = JasperFillManager.fillReport(jr, reportparams,
|
||||
new JRMapArrayDataSource(new Object[] { reportfields }));
|
||||
JasperPrint jp = JasperFillManager.fillReport(jr, reportparams, new JRMapArrayDataSource(new Object[]{reportfields}));
|
||||
|
||||
PrintService service = ReportUtils.getPrintService(m_App.getProperties().getProperty("machine.printername"));
|
||||
|
||||
@@ -2104,6 +2124,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private Object executeEvent(TicketInfo ticket, Object ticketext, String eventkey, ScriptArg... args) {
|
||||
|
||||
String resource = m_jbtnconfig.getEvent(eventkey);
|
||||
@@ -2242,6 +2263,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
"<b>" + AppLocal.getIntString("label.vip") + " : " + "</b>" + vip + "<br>" +
|
||||
"<b>" + AppLocal.getIntString("label.discount") + " : " + "</b>" + discount + "<br>";
|
||||
|
||||
|
||||
JFrame frame = new JFrame();
|
||||
JOptionPane.showMessageDialog(frame,
|
||||
content,
|
||||
@@ -2345,14 +2367,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* This method is called from within the constructor to
|
||||
* initialize the form.
|
||||
* WARNING: Do NOT modify this code. The content of this method is
|
||||
* always regenerated by the FormEditor.
|
||||
*/
|
||||
// <editor-fold defaultstate="collapsed" desc="Generated
|
||||
// Code">//GEN-BEGIN:initComponents
|
||||
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||
private void initComponents() {
|
||||
|
||||
m_jPanContainer = new javax.swing.JPanel();
|
||||
@@ -2379,8 +2401,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
jCheckStock = new javax.swing.JButton();
|
||||
m_jPanelCentral = new javax.swing.JPanel();
|
||||
jPanel4 = new javax.swing.JPanel();
|
||||
filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0),
|
||||
new java.awt.Dimension(5, 32767));
|
||||
filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 32767));
|
||||
m_jTicketId = new javax.swing.JLabel();
|
||||
m_jPanTotals = new javax.swing.JPanel();
|
||||
m_jLblTotalEuros3 = new javax.swing.JLabel();
|
||||
@@ -2525,32 +2546,26 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(m_jButtonsLayout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
|
||||
.addComponent(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
m_jButtonsLayout.setVerticalGroup(
|
||||
m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(m_jButtonsLayout.createSequentialGroup()
|
||||
.addGap(5, 5, 5)
|
||||
.addGroup(m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
|
||||
.addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, 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)));
|
||||
.addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 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);
|
||||
|
||||
@@ -2793,9 +2808,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
m_jPrice.setFont(new java.awt.Font("Arial", 1, 16)); // NOI18N
|
||||
m_jPrice.setForeground(new java.awt.Color(76, 197, 237));
|
||||
m_jPrice.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
|
||||
m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(
|
||||
javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)),
|
||||
javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
|
||||
m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
|
||||
m_jPrice.setOpaque(true);
|
||||
m_jPrice.setPreferredSize(new java.awt.Dimension(100, 25));
|
||||
m_jPrice.setRequestFocusEnabled(false);
|
||||
@@ -2845,46 +2858,36 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
.addGroup(jPanel9Layout.createSequentialGroup()
|
||||
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
|
||||
.addComponent(m_jPor)
|
||||
.addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
|
||||
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel9Layout.createSequentialGroup()
|
||||
.addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGap(7, 7, 7)
|
||||
.addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))
|
||||
.addGroup(jPanel9Layout.createSequentialGroup()
|
||||
.addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGap(5, 5, 5)))
|
||||
.addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addContainerGap()));
|
||||
.addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addContainerGap())
|
||||
);
|
||||
jPanel9Layout.setVerticalGroup(
|
||||
jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel9Layout.createSequentialGroup()
|
||||
.addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGap(0, 0, Short.MAX_VALUE))
|
||||
.addGroup(jPanel9Layout.createSequentialGroup()
|
||||
.addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
|
||||
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel9Layout.createSequentialGroup()
|
||||
.addComponent(m_jPor)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED,
|
||||
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1,
|
||||
javax.swing.GroupLayout.PREFERRED_SIZE)));
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 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);
|
||||
|
||||
@@ -3295,7 +3298,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
CustomerInfoExt m_customerInfo = dialog.getSelectedCustomer();
|
||||
if (dialog.getSelectedCustomer() != null) {
|
||||
try {
|
||||
m_oTicket.setCustomer(dlSales.loadCustomerExt(dialog.getSelectedCustomer().getId()));
|
||||
m_oTicket.setCustomer(dlSales.loadCustomerExt
|
||||
(dialog.getSelectedCustomer().getId()));
|
||||
} catch (BasicException ex) {
|
||||
log.error(ex.getMessage());
|
||||
}
|
||||
@@ -3313,10 +3317,11 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
|
||||
if (finder.getSelectedCustomer() != null) {
|
||||
try {
|
||||
m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
|
||||
m_oTicket.setCustomer(dlSales.loadCustomerExt
|
||||
(finder.getSelectedCustomer().getId()));
|
||||
if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
|
||||
restDB.setCustomerNameInTableByTicketId(
|
||||
dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
|
||||
restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
|
||||
(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
|
||||
}
|
||||
|
||||
checkCustomer();
|
||||
@@ -3347,10 +3352,11 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
|
||||
if (finder.getSelectedCustomer() != null) {
|
||||
try {
|
||||
m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
|
||||
m_oTicket.setCustomer(dlSales.loadCustomerExt
|
||||
(finder.getSelectedCustomer().getId()));
|
||||
if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
|
||||
restDB.setCustomerNameInTableByTicketId(
|
||||
dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
|
||||
restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
|
||||
(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
|
||||
}
|
||||
|
||||
checkCustomer();
|
||||
@@ -3426,10 +3432,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
private javax.swing.JButton m_jbtnScale;
|
||||
// End of variables declaration//GEN-END:variables
|
||||
|
||||
/*
|
||||
* Remote Orders Display
|
||||
* We only know about uniCenta oPOS orders and won't try and handle any
|
||||
* that are injected from an external source
|
||||
/* Remote Orders Display
|
||||
We only know about uniCenta oPOS orders and won't try and handle any
|
||||
that are injected from an external source
|
||||
*/
|
||||
|
||||
public void remoteOrderDisplay() {
|
||||
@@ -3487,23 +3492,29 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
||||
}
|
||||
}
|
||||
|
||||
dlSystem.addOrder(getPickupString(m_oTicket), (int) m_oTicket.getLine(i).getMultiply(),
|
||||
m_oTicket.getLine(i).getProductName(), m_oTicket.getLine(i).getProductAttSetInstDesc(),
|
||||
m_oTicket.getLine(i).getProperty("notes"), id, null, display, null, null);
|
||||
dlSystem.addOrder(getPickupString(m_oTicket)
|
||||
, (int) m_oTicket.getLine(i).getMultiply()
|
||||
, m_oTicket.getLine(i).getProductName()
|
||||
, 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
|
||||
* dlSystem.updateOrder(getPickupString(m_oTicket)
|
||||
* , (int) m_oTicket.getLine(i).getMultiply()
|
||||
* , m_oTicket.getLine(i).getProductName()
|
||||
* , 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
|
||||
dlSystem.updateOrder(getPickupString(m_oTicket)
|
||||
, (int) m_oTicket.getLine(i).getMultiply()
|
||||
, m_oTicket.getLine(i).getProductName()
|
||||
, m_oTicket.getLine(i).getProductAttSetInstDesc()
|
||||
, m_oTicket.getLine(i).getProperty("notes")
|
||||
, id
|
||||
, null
|
||||
, display
|
||||
, null
|
||||
, null);
|
||||
*/
|
||||
|
||||
} catch (BasicException ex) {
|
||||
|
||||
@@ -74,8 +74,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
private DataLogicSales dlSales = null;
|
||||
private DataLogicSystem dlSystem = null;
|
||||
private final RestaurantDBUtils restDB;
|
||||
private static final Icon ICO_OCU_SM = new ImageIcon(
|
||||
Place.class.getResource("/com/unicenta/images/edit_group_sm.png"));
|
||||
private static final Icon ICO_OCU_SM = new ImageIcon(Place.class.getResource("/com/unicenta/images/edit_group_sm.png"));
|
||||
private static final Icon ICO_WAITER = new NullIcon(1, 1);
|
||||
private static final Icon ICO_FRE = new NullIcon(22, 22);
|
||||
private String waiterDetails;
|
||||
@@ -88,12 +87,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
private AppView m_app;
|
||||
private Boolean showLayout = false;
|
||||
|
||||
/**
|
||||
* Creates new form JTicketsBagRestaurant
|
||||
*
|
||||
|
||||
/** Creates new form JTicketsBagRestaurant
|
||||
* @param app
|
||||
* @param panelticket
|
||||
*/
|
||||
* @param panelticket */
|
||||
|
||||
public JTicketsBagRestaurantMap(AppView app, TicketsEditor panelticket) {
|
||||
|
||||
@@ -220,7 +217,8 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
pl.setY(newY);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
pl.getButton().addActionListener(new MyActionListener(pl));
|
||||
}
|
||||
@@ -420,8 +418,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
m_PlaceCurrent = null;
|
||||
|
||||
} else {
|
||||
JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticketlockoverriden"),
|
||||
AppLocal.getIntString("title.editor"), JOptionPane.INFORMATION_MESSAGE);
|
||||
JOptionPane.showMessageDialog(null
|
||||
, AppLocal.getIntString("message.sharedticketlockoverriden")
|
||||
, AppLocal.getIntString("title.editor")
|
||||
, JOptionPane.INFORMATION_MESSAGE);
|
||||
}
|
||||
} catch (BasicException ex) {
|
||||
log.error(ex.getMessage());
|
||||
@@ -598,8 +598,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
place.getButton().setIcon((Boolean.parseBoolean(
|
||||
m_App.getProperties().getProperty("table.showwaiterdetails"))
|
||||
&& (restDB.getCustomerNameInTable(place.getName()) !=null))
|
||||
? ICO_WAITER
|
||||
: ICO_OCU_SM);
|
||||
? ICO_WAITER:ICO_OCU_SM);
|
||||
if (m_App.getProperties().getProperty("table.customercolour")== null){
|
||||
customerDetails = (restDB.getCustomerNameInTable(place.getName()) ==null)? ""
|
||||
:"<style=font-size:9px;font-weight:bold;><font color = blue>"
|
||||
@@ -647,9 +646,12 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
// places here
|
||||
|
||||
} else {
|
||||
m_jText.setText(AppLocal.getIntString("label.restaurantcustomer", new Object[] {
|
||||
m_jText.setText(AppLocal.getIntString("label.restaurantcustomer"
|
||||
, new Object[] {
|
||||
customer.getName()
|
||||
}));
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
m_aplaces.stream()
|
||||
.forEach((place) -> {
|
||||
@@ -658,9 +660,11 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
m_jbtnReservations.setEnabled(false);
|
||||
}
|
||||
} else {
|
||||
m_jText.setText(AppLocal.getIntString("label.restaurantmove", new Object[] {
|
||||
m_jText.setText(AppLocal.getIntString("label.restaurantmove"
|
||||
, new Object[] {
|
||||
m_PlaceClipboard.getName()
|
||||
}));
|
||||
}
|
||||
));
|
||||
|
||||
m_aplaces.stream()
|
||||
.forEach((place) -> {
|
||||
@@ -705,11 +709,9 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
private class MyActionListener implements ActionListener {
|
||||
|
||||
private final Place m_place;
|
||||
|
||||
public MyActionListener(Place place) {
|
||||
m_place = place;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent evt) {
|
||||
m_App.getAppUserView().getUser();
|
||||
@@ -721,7 +723,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
TicketInfo ticket = getTicketInfo(m_place);
|
||||
if (ticket == null) { // It's an empty table
|
||||
ticket = new TicketInfo();
|
||||
ticket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
|
||||
ticket.setUser(m_App.getAppUserView().getUser().getUserInfo());
|
||||
try {
|
||||
dlReceipts.insertSharedTicket(m_place.getId(), ticket, ticket.getPickupId());
|
||||
} catch (BasicException e) {
|
||||
@@ -740,9 +742,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
AppLocal.getIntString("message.sharedticketlock"));
|
||||
|
||||
if (m_App.getAppUserView().getUser().hasPermission("sales.Override")) { // Override it
|
||||
int res = JOptionPane.showConfirmDialog(null,
|
||||
AppLocal.getIntString("message.sharedticketlockoverride"), AppLocal.getIntString("title.editor"),
|
||||
JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
|
||||
int res = JOptionPane.showConfirmDialog(null
|
||||
, AppLocal.getIntString("message.sharedticketlockoverride")
|
||||
, AppLocal.getIntString("title.editor")
|
||||
, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
|
||||
|
||||
if (res == JOptionPane.YES_OPTION) {
|
||||
m_place.setPeople(true);
|
||||
@@ -763,8 +766,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
m_lockState = "locked";
|
||||
setActivePlace(m_place, ticket);
|
||||
} else {
|
||||
JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticket"),
|
||||
AppLocal.getIntString("title.editor"), JOptionPane.OK_OPTION);
|
||||
JOptionPane.showMessageDialog(null
|
||||
, AppLocal.getIntString("message.sharedticket")
|
||||
, AppLocal.getIntString("title.editor")
|
||||
, JOptionPane.OK_OPTION);
|
||||
}
|
||||
}
|
||||
} catch (BasicException ex) {
|
||||
@@ -886,14 +891,14 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
m_PlaceClipboard.setButtonText(btnText);
|
||||
}
|
||||
|
||||
/**
|
||||
* This method is called from within the constructor to
|
||||
|
||||
|
||||
/** This method is called from within the constructor to
|
||||
* initialize the form.
|
||||
* WARNING: Do NOT modify this code. The content of this method is
|
||||
* always regenerated by the Form Editor.
|
||||
*/
|
||||
// <editor-fold defaultstate="collapsed" desc="Generated
|
||||
// Code">//GEN-BEGIN:initComponents
|
||||
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||
private void initComponents() {
|
||||
|
||||
m_jPanelMap = new javax.swing.JPanel();
|
||||
@@ -1064,6 +1069,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
||||
});
|
||||
}//GEN-LAST:event_m_jbtnSaveActionPerformed
|
||||
|
||||
|
||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||
private javax.swing.JPanel jPanel1;
|
||||
private javax.swing.JPanel jPanel2;
|
||||
|
||||
@@ -55,27 +55,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
|
||||
private static final DateFormat m_dateformat = new SimpleDateFormat("hh:mm");
|
||||
|
||||
private String host;
|
||||
private String id;
|
||||
private int ticketType;
|
||||
private int ticketId;
|
||||
private int pickupId;
|
||||
private java.util.Date date;
|
||||
private String m_sHost;
|
||||
private String m_sId;
|
||||
private int tickettype;
|
||||
private int m_iTicketId;
|
||||
private int m_iPickupId;
|
||||
private java.util.Date m_dDate;
|
||||
private Properties attributes;
|
||||
private UserInfo userInfo;
|
||||
private UserInfo m_User;
|
||||
private Double multiply;
|
||||
private CustomerInfoExt cutomerInfoExt;
|
||||
private String activeCash;
|
||||
private List<TicketLineInfo> ticketLines;
|
||||
private CustomerInfoExt m_Customer;
|
||||
private String m_sActiveCash;
|
||||
private List<TicketLineInfo> m_aLines;
|
||||
private List<PaymentInfo> payments;
|
||||
private List<TicketTaxInfo> taxes;
|
||||
private final String m_sResponse;
|
||||
private String loyaltyCardNumber;
|
||||
private Boolean oldTicket;
|
||||
private boolean tip;
|
||||
private PaymentInfoTicket ticketPaymentInfo;
|
||||
private boolean isProcessed;
|
||||
private final String locked;
|
||||
private PaymentInfoTicket m_paymentInfo;
|
||||
private boolean m_isProcessed;
|
||||
private final String m_locked;
|
||||
private Double nsum;
|
||||
private int ticketstatus;
|
||||
|
||||
@@ -91,15 +91,15 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
|
||||
/** Creates new TicketModel */
|
||||
public TicketInfo() {
|
||||
id = UUID.randomUUID().toString();
|
||||
ticketType = RECEIPT_NORMAL;
|
||||
ticketId = 0; // incrementamos
|
||||
date = new Date();
|
||||
m_sId = UUID.randomUUID().toString();
|
||||
tickettype = RECEIPT_NORMAL;
|
||||
m_iTicketId = 0; // incrementamos
|
||||
m_dDate = new Date();
|
||||
attributes = new Properties();
|
||||
userInfo = null;
|
||||
cutomerInfoExt = null;
|
||||
activeCash = null;
|
||||
ticketLines = new ArrayList<>();
|
||||
m_User = null;
|
||||
m_Customer = null;
|
||||
m_sActiveCash = null;
|
||||
m_aLines = new ArrayList<>();
|
||||
payments = new ArrayList<>();
|
||||
taxes = null;
|
||||
m_sResponse = null;
|
||||
@@ -109,35 +109,35 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
|
||||
config.load();
|
||||
tip = Boolean.valueOf(config.getProperty("machine.showTip"));
|
||||
isProcessed = false;
|
||||
locked = null;
|
||||
m_isProcessed = false;
|
||||
m_locked = null;
|
||||
ticketstatus = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeExternal(ObjectOutput out) throws IOException {
|
||||
out.writeObject(id);
|
||||
out.writeInt(ticketType);
|
||||
out.writeInt(ticketId);
|
||||
out.writeObject(cutomerInfoExt);
|
||||
out.writeObject(date);
|
||||
out.writeObject(m_sId);
|
||||
out.writeInt(tickettype);
|
||||
out.writeInt(m_iTicketId);
|
||||
out.writeObject(m_Customer);
|
||||
out.writeObject(m_dDate);
|
||||
out.writeObject(attributes);
|
||||
out.writeObject(ticketLines);
|
||||
out.writeObject(m_aLines);
|
||||
|
||||
out.writeInt(ticketstatus);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
|
||||
id = (String) in.readObject();
|
||||
ticketType = in.readInt();
|
||||
ticketId = in.readInt();
|
||||
cutomerInfoExt = (CustomerInfoExt) in.readObject();
|
||||
date = (Date) in.readObject();
|
||||
m_sId = (String) in.readObject();
|
||||
tickettype = in.readInt();
|
||||
m_iTicketId = in.readInt();
|
||||
m_Customer = (CustomerInfoExt) in.readObject();
|
||||
m_dDate = (Date) in.readObject();
|
||||
attributes = (Properties) in.readObject();
|
||||
ticketLines = (List<TicketLineInfo>) in.readObject();
|
||||
userInfo = null;
|
||||
activeCash = null;
|
||||
m_aLines = (List<TicketLineInfo>) in.readObject();
|
||||
m_User = null;
|
||||
m_sActiveCash = null;
|
||||
payments = new ArrayList<>(); // JG June 2102 diamond inference
|
||||
taxes = null;
|
||||
|
||||
@@ -151,11 +151,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
*/
|
||||
@Override
|
||||
public void readValues(DataRead dr) throws BasicException {
|
||||
id = dr.getString(1);
|
||||
ticketType = dr.getInt(2);
|
||||
ticketId = dr.getInt(3);
|
||||
date = dr.getTimestamp(4);
|
||||
activeCash = dr.getString(5);
|
||||
m_sId = dr.getString(1);
|
||||
tickettype = dr.getInt(2);
|
||||
m_iTicketId = dr.getInt(3);
|
||||
m_dDate = dr.getTimestamp(4);
|
||||
m_sActiveCash = dr.getString(5);
|
||||
try {
|
||||
byte[] img = dr.getBytes(6);
|
||||
if (img != null) {
|
||||
@@ -163,9 +163,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
}
|
||||
} catch (IOException e) {
|
||||
}
|
||||
userInfo = new UserInfo(dr.getString(7), dr.getString(8));
|
||||
cutomerInfoExt = new CustomerInfoExt(dr.getString(9));
|
||||
ticketLines = new ArrayList<>();
|
||||
m_User = new UserInfo(dr.getString(7), dr.getString(8));
|
||||
m_Customer = new CustomerInfoExt(dr.getString(9));
|
||||
m_aLines = new ArrayList<>();
|
||||
payments = new ArrayList<>();
|
||||
taxes = null;
|
||||
|
||||
@@ -177,72 +177,69 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
* @return
|
||||
*/
|
||||
public TicketInfo copyTicket() {
|
||||
TicketInfo ticketInfo = new TicketInfo();
|
||||
TicketInfo t = new TicketInfo();
|
||||
|
||||
ticketInfo.ticketType = ticketType;
|
||||
ticketInfo.ticketId = ticketId;
|
||||
ticketInfo.date = date;
|
||||
ticketInfo.activeCash = activeCash;
|
||||
ticketInfo.attributes = (Properties) attributes.clone();
|
||||
ticketInfo.userInfo = userInfo;
|
||||
ticketInfo.cutomerInfoExt = cutomerInfoExt;
|
||||
t.tickettype = tickettype;
|
||||
t.m_iTicketId = m_iTicketId;
|
||||
t.m_dDate = m_dDate;
|
||||
t.m_sActiveCash = m_sActiveCash;
|
||||
t.attributes = (Properties) attributes.clone();
|
||||
t.m_User = m_User;
|
||||
t.m_Customer = m_Customer;
|
||||
|
||||
ticketInfo.ticketLines = new ArrayList<>(); // JG June 2102 diamond inference
|
||||
ticketLines.forEach((line) -> {
|
||||
ticketInfo.ticketLines.add(line.copyTicketLine());
|
||||
t.m_aLines = new ArrayList<>(); // JG June 2102 diamond inference
|
||||
m_aLines.forEach((l) -> {
|
||||
t.m_aLines.add(l.copyTicketLine());
|
||||
});
|
||||
ticketInfo.refreshLines();
|
||||
t.refreshLines();
|
||||
|
||||
ticketInfo.payments = new LinkedList<>(); // JG June 2102 diamond inference
|
||||
t.payments = new LinkedList<>(); // JG June 2102 diamond inference
|
||||
payments.forEach((p) -> {
|
||||
ticketInfo.payments.add(p.copyPayment());
|
||||
t.payments.add(p.copyPayment());
|
||||
});
|
||||
ticketInfo.oldTicket = oldTicket;
|
||||
t.oldTicket=oldTicket;
|
||||
// taxes are not copied, must be calculated again.
|
||||
|
||||
ticketInfo.ticketstatus = ticketstatus;
|
||||
t.ticketstatus = ticketstatus;
|
||||
|
||||
return ticketInfo;
|
||||
return t;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
return m_sId;
|
||||
}
|
||||
|
||||
public int getTicketType() {
|
||||
return ticketType;
|
||||
return tickettype;
|
||||
}
|
||||
|
||||
public void setTicketType(int tickettype) {
|
||||
this.ticketType = tickettype;
|
||||
this.tickettype = tickettype;
|
||||
}
|
||||
|
||||
public int getTicketId() {
|
||||
return ticketId;
|
||||
return m_iTicketId;
|
||||
}
|
||||
|
||||
public void setTicketId(int iTicketId) {
|
||||
ticketId = iTicketId;
|
||||
m_iTicketId = iTicketId;
|
||||
}
|
||||
|
||||
public int getTicketStatus() {
|
||||
return ticketstatus;
|
||||
}
|
||||
|
||||
public void setTicketStatus(int ticketstatus) {
|
||||
if (ticketId > 0) {
|
||||
this.ticketstatus = ticketId;
|
||||
if (m_iTicketId >0) {
|
||||
this.ticketstatus = m_iTicketId;
|
||||
}else{
|
||||
this.ticketstatus = ticketstatus;
|
||||
}
|
||||
}
|
||||
|
||||
public void setPickupId(int iTicketId) {
|
||||
pickupId = iTicketId;
|
||||
m_iPickupId = iTicketId;
|
||||
}
|
||||
|
||||
public int getPickupId() {
|
||||
return pickupId;
|
||||
return m_iPickupId;
|
||||
}
|
||||
|
||||
public String getName(Object info) {
|
||||
@@ -254,23 +251,23 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
name.add(nameprop);
|
||||
}
|
||||
|
||||
if (userInfo != null) {
|
||||
name.add(userInfo.getName());
|
||||
if (m_User != null) {
|
||||
name.add(m_User.getName());
|
||||
}
|
||||
|
||||
if (info == null) {
|
||||
if (ticketId == 0) {
|
||||
name.add("(" + m_dateformat.format(date) + " "
|
||||
+ Long.toString(date.getTime() % 1000) + ")");
|
||||
if (m_iTicketId == 0) {
|
||||
name.add("(" + m_dateformat.format(m_dDate) + " "
|
||||
+ Long.toString(m_dDate.getTime() % 1000) + ")");
|
||||
} else {
|
||||
name.add(Integer.toString(ticketId));
|
||||
name.add(Integer.toString(m_iTicketId));
|
||||
}
|
||||
} else {
|
||||
name.add(info.toString());
|
||||
}
|
||||
|
||||
if (cutomerInfoExt != null) {
|
||||
name.add(cutomerInfoExt.getName());
|
||||
if (m_Customer != null) {
|
||||
name.add(m_Customer.getName());
|
||||
}
|
||||
|
||||
return org.apache.commons.lang.StringUtils.join(name, " - ");
|
||||
@@ -281,11 +278,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
}
|
||||
|
||||
public java.util.Date getDate() {
|
||||
return date;
|
||||
return m_dDate;
|
||||
}
|
||||
|
||||
public void setDate(java.util.Date dDate) {
|
||||
date = dDate;
|
||||
m_dDate = dDate;
|
||||
}
|
||||
|
||||
public String getHost() {
|
||||
@@ -297,27 +294,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
return machineHostname;
|
||||
}
|
||||
|
||||
public UserInfo getUserInfo() {
|
||||
return userInfo;
|
||||
public UserInfo getUser() {
|
||||
return m_User;
|
||||
}
|
||||
|
||||
public void setUserInfo(UserInfo value) {
|
||||
userInfo = value;
|
||||
public void setUser(UserInfo value) {
|
||||
m_User = value;
|
||||
}
|
||||
|
||||
public CustomerInfoExt getCustomer() {
|
||||
return cutomerInfoExt;
|
||||
return m_Customer;
|
||||
}
|
||||
|
||||
public void setCustomer(CustomerInfoExt value) {
|
||||
cutomerInfoExt = value;
|
||||
m_Customer = value;
|
||||
}
|
||||
|
||||
public String getCustomerId() {
|
||||
if (cutomerInfoExt == null) {
|
||||
if (m_Customer == null) {
|
||||
return null;
|
||||
} else {
|
||||
return cutomerInfoExt.getId();
|
||||
return m_Customer.getId();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -334,11 +331,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
}
|
||||
|
||||
public void setActiveCash(String value) {
|
||||
activeCash = value;
|
||||
m_sActiveCash = value;
|
||||
}
|
||||
|
||||
public String getActiveCash() {
|
||||
return activeCash;
|
||||
return m_sActiveCash;
|
||||
}
|
||||
|
||||
public String getProperty(String key) {
|
||||
@@ -358,45 +355,45 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
}
|
||||
|
||||
public TicketLineInfo getLine(int index) {
|
||||
return ticketLines.get(index);
|
||||
return m_aLines.get(index);
|
||||
}
|
||||
|
||||
public void addLine(TicketLineInfo oLine) {
|
||||
oLine.setTicket(id, ticketLines.size());
|
||||
ticketLines.add(oLine);
|
||||
oLine.setTicket(m_sId, m_aLines.size());
|
||||
m_aLines.add(oLine);
|
||||
}
|
||||
|
||||
public void insertLine(int index, TicketLineInfo oLine) {
|
||||
ticketLines.add(index, oLine);
|
||||
m_aLines.add(index, oLine);
|
||||
refreshLines();
|
||||
}
|
||||
|
||||
public void setLine(int index, TicketLineInfo oLine) {
|
||||
oLine.setTicket(id, index);
|
||||
ticketLines.set(index, oLine);
|
||||
oLine.setTicket(m_sId, index);
|
||||
m_aLines.set(index, oLine);
|
||||
}
|
||||
|
||||
public void removeLine(int index) {
|
||||
ticketLines.remove(index);
|
||||
m_aLines.remove(index);
|
||||
refreshLines();
|
||||
|
||||
}
|
||||
|
||||
public void refreshLines() {
|
||||
for (int i = 0; i < ticketLines.size(); i++) {
|
||||
getLine(i).setTicket(id, i);
|
||||
for (int i = 0; i < m_aLines.size(); i++) {
|
||||
getLine(i).setTicket(m_sId, i);
|
||||
}
|
||||
}
|
||||
|
||||
public int getLinesCount() {
|
||||
return ticketLines.size();
|
||||
return m_aLines.size();
|
||||
}
|
||||
|
||||
public double getArticlesCount() {
|
||||
double dArticles = 0.0;
|
||||
TicketLineInfo oLine;
|
||||
|
||||
for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
|
||||
for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
|
||||
oLine = i.next();
|
||||
dArticles += oLine.getMultiply();
|
||||
}
|
||||
@@ -406,8 +403,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
|
||||
public double getSubTotal() {
|
||||
double sum = 0.0;
|
||||
sum = ticketLines.stream().map((line) -> line.getSubValue()).reduce(sum,
|
||||
(accumulator, _item) -> accumulator + _item);
|
||||
sum = m_aLines.stream().map((line) ->
|
||||
line.getSubValue()).reduce(sum, (accumulator, _item) ->
|
||||
accumulator + _item);
|
||||
return sum;
|
||||
}
|
||||
|
||||
@@ -420,7 +418,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
nsum = sum;
|
||||
}
|
||||
} else {
|
||||
sum = ticketLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
|
||||
sum = m_aLines.stream().map((line) ->
|
||||
line.getTax()).reduce(sum, (accumulator, _item) ->
|
||||
accumulator + _item);
|
||||
}
|
||||
return sum;
|
||||
}
|
||||
@@ -437,8 +437,10 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
|
||||
public double getTotalPaid() {
|
||||
double sum = 0.0;
|
||||
sum = payments.stream().filter((p) -> (!"debtpaid".equals(p.getName()))).map((p) -> p.getTotal()).reduce(sum,
|
||||
(accumulator, _item) -> accumulator + _item);
|
||||
sum = payments.stream().filter((p) ->
|
||||
(!"debtpaid".equals(p.getName()))).map((p) ->
|
||||
p.getTotal()).reduce(sum, (accumulator, _item) ->
|
||||
accumulator + _item);
|
||||
return sum;
|
||||
}
|
||||
|
||||
@@ -447,11 +449,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
}
|
||||
|
||||
public List<TicketLineInfo> getLines() {
|
||||
return ticketLines;
|
||||
return m_aLines;
|
||||
}
|
||||
|
||||
public void setLines(List<TicketLineInfo> l) {
|
||||
ticketLines = l;
|
||||
m_aLines = l;
|
||||
}
|
||||
|
||||
public List<PaymentInfo> getPayments() {
|
||||
@@ -491,7 +493,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
}
|
||||
|
||||
public void setIsProcessed(boolean isP) {
|
||||
isProcessed = isP;
|
||||
m_isProcessed = isP;
|
||||
}
|
||||
|
||||
public TicketTaxInfo getTaxLine(TaxInfo tax) {
|
||||
@@ -510,7 +512,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
Map<String, TicketTaxInfo> m = new HashMap<>();
|
||||
|
||||
TicketLineInfo oLine;
|
||||
for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
|
||||
for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
|
||||
oLine = i.next();
|
||||
|
||||
TicketTaxInfo t = m.get(oLine.getTaxInfo().getId());
|
||||
@@ -536,8 +538,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
|
||||
m_config =null;
|
||||
|
||||
if (ticketId > 0) {
|
||||
String tmpTicketId = Integer.toString(ticketId);
|
||||
if (m_iTicketId > 0) {
|
||||
String tmpTicketId=Integer.toString(m_iTicketId);
|
||||
if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())){
|
||||
if (receiptPrefix != null){
|
||||
tmpTicketId=receiptPrefix+tmpTicketId;
|
||||
@@ -557,18 +559,19 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
}
|
||||
|
||||
public String printDate() {
|
||||
return Formats.TIMESTAMP.formatValue(date);
|
||||
return Formats.TIMESTAMP.formatValue(m_dDate);
|
||||
}
|
||||
|
||||
public String printUser() {
|
||||
return userInfo == null ? "" : userInfo.getName();
|
||||
return m_User == null ? "" : m_User.getName();
|
||||
|
||||
}
|
||||
|
||||
public String printHost() {
|
||||
return host;
|
||||
return m_sHost;
|
||||
}
|
||||
|
||||
|
||||
// Added JDL 28.05.13 for loyalty card functions
|
||||
|
||||
/**
|
||||
@@ -595,11 +598,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
}
|
||||
|
||||
public String printCustomer() {
|
||||
return cutomerInfoExt == null ? "" : cutomerInfoExt.getName();
|
||||
return m_Customer == null ? "" : m_Customer.getName();
|
||||
}
|
||||
|
||||
public String printPhone1() {
|
||||
return cutomerInfoExt == null ? "" : cutomerInfoExt.getPhone1();
|
||||
return m_Customer == null ? "" : m_Customer.getPhone1();
|
||||
}
|
||||
|
||||
public String printArticlesCount() {
|
||||
@@ -639,7 +642,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
||||
}
|
||||
|
||||
public String getTicketHeaderFooterData(String data) {
|
||||
AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
|
||||
AppConfig m_config = new AppConfig(new File((System.getProperty("user.home"))
|
||||
, AppLocal.APP_ID + ".properties"));
|
||||
m_config.load();
|
||||
String row =(m_config.getProperty("tkt."+data));
|
||||
|
||||
|
||||
@@ -56,15 +56,12 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
|
||||
private double newprice = 0.0;
|
||||
|
||||
/**
|
||||
* Creates new TicketLineInfo
|
||||
*
|
||||
/** Creates new TicketLineInfo
|
||||
* @param productid
|
||||
* @param dMultiply
|
||||
* @param dPrice
|
||||
* @param tax
|
||||
* @param props
|
||||
*/
|
||||
* @param props */
|
||||
public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
|
||||
init(productid, null, dMultiply, dPrice, tax, props);
|
||||
}
|
||||
@@ -82,7 +79,6 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
|
||||
/**
|
||||
* Example: Call from script.TotalDiscount event
|
||||
*
|
||||
* @param productid
|
||||
* @param productname
|
||||
* @param producttaxcategory
|
||||
@@ -91,8 +87,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
* @param dPrice
|
||||
* @param tax
|
||||
*/
|
||||
public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter,
|
||||
double dMultiply, double dPrice, TaxInfo tax) {
|
||||
public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
|
||||
Properties props = new Properties();
|
||||
props.setProperty("product.name", productname);
|
||||
props.setProperty("product.taxcategoryid", producttaxcategory);
|
||||
@@ -103,7 +98,6 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
|
||||
/**
|
||||
* Example: Call from script.LineDiscount event
|
||||
*
|
||||
* @param productname
|
||||
* @param producttaxcategory
|
||||
* @param productprinter //added to props as may introduce printer redirect
|
||||
@@ -111,8 +105,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
* @param dPrice
|
||||
* @param tax
|
||||
*/
|
||||
public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply,
|
||||
double dPrice, TaxInfo tax) {
|
||||
public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
|
||||
|
||||
Properties props = new Properties();
|
||||
props.setProperty("product.name", productname);
|
||||
@@ -215,8 +208,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
line.tax, (Properties) line.attributes.clone());
|
||||
}
|
||||
|
||||
private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax,
|
||||
Properties attributes) {
|
||||
private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
|
||||
|
||||
this.productid = productid;
|
||||
this.attsetinstid = attsetinstid;
|
||||
@@ -314,40 +306,31 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
public int getTicketLine() {
|
||||
return m_iLine;
|
||||
}
|
||||
|
||||
// These are the Lookups
|
||||
public String getProductID() {
|
||||
return productid;
|
||||
}
|
||||
|
||||
public String getProductCategoryID() {
|
||||
return (attributes.getProperty("product.categoryid"));
|
||||
}
|
||||
|
||||
public String getProductAttSetId() {
|
||||
return attributes.getProperty("product.attsetid");
|
||||
}
|
||||
|
||||
public String getProductAttSetInstId() {
|
||||
return attsetinstid;
|
||||
}
|
||||
|
||||
public String getProductAttSetInstDesc() {
|
||||
return attributes.getProperty("product.attsetdesc", "");
|
||||
}
|
||||
|
||||
public String getProductTaxCategoryID() {
|
||||
return (attributes.getProperty("product.taxcategoryid"));
|
||||
}
|
||||
|
||||
public String getTicketUpdated() {
|
||||
return (attributes.getProperty("ticket.updated"));
|
||||
}
|
||||
|
||||
public TaxInfo getTaxInfo() {
|
||||
return tax;
|
||||
}
|
||||
|
||||
public void setTaxInfo(TaxInfo oTaxInfo) {
|
||||
tax = oTaxInfo;
|
||||
}
|
||||
@@ -356,28 +339,22 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
public String getProductName() {
|
||||
return attributes.getProperty("product.name");
|
||||
}
|
||||
|
||||
public String getProductMemoDate() {
|
||||
return attributes.getProperty("product.memodate");
|
||||
}
|
||||
|
||||
public double getPrice() {
|
||||
return price;
|
||||
}
|
||||
|
||||
public double getMultiply() {
|
||||
return multiply;
|
||||
}
|
||||
|
||||
public double getTaxRate() {
|
||||
return tax == null ? 0.0 : tax.getRate();
|
||||
}
|
||||
|
||||
public double getNewPrice() {
|
||||
newprice = price * (1.0 + getTaxRate());
|
||||
return price;
|
||||
}
|
||||
|
||||
public String getProductPrinter() {
|
||||
return attributes.getProperty("product.printer");
|
||||
}
|
||||
@@ -390,11 +367,9 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
public Properties getProperties() {
|
||||
return attributes;
|
||||
}
|
||||
|
||||
public String getProperty(String key) {
|
||||
return attributes.getProperty(key);
|
||||
}
|
||||
|
||||
public String getProperty(String key, String defaultvalue) {
|
||||
return attributes.getProperty(key, defaultvalue);
|
||||
}
|
||||
@@ -403,11 +378,9 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
public double getTax() {
|
||||
return price * multiply * getTaxRate();
|
||||
}
|
||||
|
||||
public double getValue() {
|
||||
return price * multiply * (1.0 + getTaxRate());
|
||||
}
|
||||
|
||||
public double getSubValue() {
|
||||
return price * multiply;
|
||||
}
|
||||
@@ -416,27 +389,21 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
public void setPrice(double dValue) {
|
||||
price = dValue;
|
||||
}
|
||||
|
||||
public void setPriceTax(double dValue) {
|
||||
price = dValue / (1.0 + getTaxRate());
|
||||
}
|
||||
|
||||
public void setMultiply(double dValue) {
|
||||
multiply = dValue;
|
||||
}
|
||||
|
||||
public void setProperty(String key, String value) {
|
||||
attributes.setProperty(key, value);
|
||||
}
|
||||
|
||||
public void setProductTaxCategoryID(String taxID){
|
||||
attributes.setProperty("product.taxcategoryid",taxID);
|
||||
}
|
||||
|
||||
public void setProductAttSetInstId(String value) {
|
||||
attsetinstid = value;
|
||||
}
|
||||
|
||||
public void setProductAttSetInstDesc(String value) {
|
||||
if (value == null) {
|
||||
attributes.remove(value);
|
||||
@@ -444,11 +411,9 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
attributes.setProperty("product.attsetdesc", value);
|
||||
}
|
||||
}
|
||||
|
||||
public void setTicketUpdated(String key, String value){
|
||||
attributes.setProperty("ticket.updated",value);
|
||||
}
|
||||
|
||||
public void setProductPrinter(String value) {
|
||||
if (value == null) {
|
||||
attributes.remove(value);
|
||||
@@ -465,79 +430,60 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
||||
public String printReference() {
|
||||
return StringUtils.encodeXML(attributes.getProperty("product.reference"));
|
||||
}
|
||||
|
||||
public String printCode() {
|
||||
return StringUtils.encodeXML(attributes.getProperty("product.code"));
|
||||
}
|
||||
|
||||
public String printName() {
|
||||
return StringUtils.encodeXML(attributes.getProperty("product.name"));
|
||||
}
|
||||
|
||||
public String printProductMemoDate() {
|
||||
return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
|
||||
}
|
||||
|
||||
public String printPrice() {
|
||||
return Formats.CURRENCY.formatValue(getPrice());
|
||||
}
|
||||
|
||||
public String printPriceTax() {
|
||||
return Formats.CURRENCY.formatValue(getPriceTax());
|
||||
}
|
||||
|
||||
public String printMultiply() {
|
||||
return Formats.DOUBLE.formatValue(multiply);
|
||||
}
|
||||
|
||||
public String printValue() {
|
||||
return Formats.CURRENCY.formatValue(getValue());
|
||||
}
|
||||
|
||||
public String printTaxRate() {
|
||||
return Formats.PERCENT.formatValue(getTaxRate());
|
||||
}
|
||||
|
||||
public String printSubValue() {
|
||||
return Formats.CURRENCY.formatValue(getSubValue());
|
||||
}
|
||||
|
||||
public String printTax() {
|
||||
return Formats.CURRENCY.formatValue(getTax());
|
||||
}
|
||||
|
||||
public String printTextTip() {
|
||||
return attributes.getProperty("product.texttip");
|
||||
}
|
||||
|
||||
public String printPrinter() {
|
||||
return StringUtils.encodeXML(attributes.getProperty("product.printer"));
|
||||
}
|
||||
|
||||
public boolean isProductCom() {
|
||||
return "true".equals(attributes.getProperty("product.com"));
|
||||
}
|
||||
|
||||
public boolean isProductService() {
|
||||
return "true".equals(attributes.getProperty("product.service"));
|
||||
}
|
||||
|
||||
public boolean isProductVprice() {
|
||||
return "true".equals(attributes.getProperty("product.vprice"));
|
||||
}
|
||||
|
||||
public boolean isProductVerpatrib() {
|
||||
return "true".equals(attributes.getProperty("product.verpatrib"));
|
||||
}
|
||||
|
||||
public boolean isProductWarranty() {
|
||||
return "true".equals(attributes.getProperty("product.warranty"));
|
||||
}
|
||||
|
||||
public boolean getUpdated() {
|
||||
return "true".equals(attributes.getProperty("ticket.updated"));
|
||||
}
|
||||
|
||||
public void setUpdated(Boolean value) {
|
||||
updated = value;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,9 @@ import com.unicenta.data.loader.DataRead;
|
||||
import com.unicenta.data.loader.IKeyed;
|
||||
import com.unicenta.data.loader.SerializerRead;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Slf4j
|
||||
public class VoucherInfo implements IKeyed {
|
||||
private String id;
|
||||
private String voucherNumber;
|
||||
@@ -40,8 +42,7 @@ public class VoucherInfo implements IKeyed {
|
||||
String voucherNumber,
|
||||
String customerName,
|
||||
double amount,
|
||||
String status)
|
||||
{
|
||||
String status) {
|
||||
this.id = id;
|
||||
this.voucherNumber = voucherNumber;
|
||||
this.customerName = customerName;
|
||||
@@ -49,7 +50,6 @@ public class VoucherInfo implements IKeyed {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Object getKey() {
|
||||
return getId();
|
||||
@@ -111,7 +111,6 @@ public class VoucherInfo implements IKeyed {
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return voucherNumber;
|
||||
@@ -132,16 +131,25 @@ public class VoucherInfo implements IKeyed {
|
||||
}
|
||||
|
||||
public static SerializerRead getSerializerRead() {
|
||||
return new SerializerRead()
|
||||
{
|
||||
return new SerializerRead() {
|
||||
@Override
|
||||
public Object readValues(DataRead dr) throws BasicException {
|
||||
return new VoucherInfo(
|
||||
VoucherInfo voucherInfo = null;
|
||||
|
||||
try {
|
||||
voucherInfo = new VoucherInfo(
|
||||
dr.getString(1),
|
||||
dr.getString(2),
|
||||
dr.getString(3),
|
||||
dr.getDouble(4),
|
||||
dr.getString(5));
|
||||
}};
|
||||
} catch (Exception e) {
|
||||
log.error("Error reading voucher info: {}", e.getMessage());
|
||||
log.error(dr.getString(2));
|
||||
}
|
||||
|
||||
return voucherInfo;
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user