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

Compare commits

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

3 Commits
UOCL-315-efr .. 2234f32e68

Author SHA1 Message Date
hugh 2234f32e68 5.5.0 release 2026-06-15 16:57:51 +01:00
hugh d095908e42 Squash merge 5.5.0-development into main 2026-06-15 16:48:30 +01:00
hugh aa6c87ab90 don't need to track these 2026-04-13 21:13:08 +01:00
17 changed files with 7259 additions and 6901 deletions
Expand all files Collapse all files
.gitignore
+2 -1
View File
@@ -7,7 +7,8 @@ nbactions.xml
*.log *.log
docker.sock docker.sock
.DS_Store .DS_Store
.settings/
.classpath .classpath
.factorypath .factorypath
.settings/
.project .project
AGENTS.md
pom.xml
+9 -14
View File
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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> <modelVersion>4.0.0</modelVersion>
<groupId>com.unicenta</groupId> <groupId>com.unicenta</groupId>
<artifactId>unicentaopos</artifactId> <artifactId>unicentaopos</artifactId>
<version>5.4.0</version> <version>5.5.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<derby.version>10.14.2.0</derby.version> <derby.version>10.14.2.0</derby.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -116,7 +115,6 @@
<artifactId>poi</artifactId> <artifactId>poi</artifactId>
<version>3.17</version> <version>3.17</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
@@ -181,7 +179,6 @@
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.swinglabs.swingx</groupId> <groupId>org.swinglabs.swingx</groupId>
@@ -255,11 +252,11 @@
<artifactId>derbytools</artifactId> <artifactId>derbytools</artifactId>
<version>${derby.version}</version> <version>${derby.version}</version>
</dependency> </dependency>
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>org.apache.derby</groupId>--> <!-- <groupId>org.apache.derby</groupId>-->
<!-- <artifactId>derbyshared</artifactId>--> <!-- <artifactId>derbyshared</artifactId>-->
<!-- <version>${derby.version}</version>--> <!-- <version>${derby.version}</version>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <dependency>
<groupId>xml-apis</groupId> <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId> <artifactId>xml-apis</artifactId>
@@ -293,7 +290,6 @@
<artifactId>DynamicJasper-core-fonts</artifactId> <artifactId>DynamicJasper-core-fonts</artifactId>
<version>2.0</version> <version>2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId> <groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId> <artifactId>ecj</artifactId>
@@ -361,7 +357,7 @@
<dependency> <dependency>
<groupId>com.unicenta</groupId> <groupId>com.unicenta</groupId>
<artifactId>unicenta-plugins</artifactId> <artifactId>unicenta-plugins</artifactId>
<version>1.3.1</version> <version>1.3.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gluonhq</groupId> <groupId>com.gluonhq</groupId>
@@ -450,7 +446,6 @@
<version>4.2.0</version> <version>4.2.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
src/main/java/com/unicenta/pos/admin/PeopleView.form
+121 -19
View File
@@ -19,10 +19,93 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-128,0,0,1,-51"/>
</AuxValues> </AuxValues>
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="m_jVisible" min="-2" pref="207" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="m_jRole" min="-2" pref="180" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="m_jImage" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLblCardID" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="m_jcard" min="-2" pref="180" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="webCBSecurity" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<Component id="m_jName" min="-2" pref="180" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="m_jName" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLblCardID" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="m_jcard" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="webCBSecurity" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="m_jRole" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel3" min="-2" pref="25" max="-2" attributes="0"/>
<Component id="m_jVisible" min="-2" pref="25" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="15" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="m_jImage" min="-2" max="-2" attributes="0"/>
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents> <SubComponents>
<Component class="javax.swing.JLabel" name="nameLabel"> <Component class="javax.swing.JLabel" name="jLabel1">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -38,10 +121,10 @@
</Property> </Property>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/> <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JTextField" name="nameTextField"> <Component class="javax.swing.JTextField" name="m_jName">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -51,7 +134,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JCheckBox" name="isVisible"> <Component class="javax.swing.JCheckBox" name="m_jVisible">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="12" style="0"/> <Font name="Arial" size="12" style="0"/>
@@ -61,7 +144,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="visiableLabel"> <Component class="javax.swing.JLabel" name="jLabel3">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -74,7 +157,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="imageLabel"> <Component class="javax.swing.JLabel" name="jLabel4">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -87,7 +170,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor"> <Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="12" style="0"/> <Font name="Arial" size="12" style="0"/>
@@ -127,7 +210,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="roleLabel"> <Component class="javax.swing.JLabel" name="jLabel2">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -140,7 +223,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JTextField" name="cardIdTextField"> <Component class="javax.swing.JTextField" name="m_jcard">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -150,7 +233,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="cardIdLabel"> <Component class="javax.swing.JLabel" name="jLblCardID">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -163,7 +246,33 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="passwordLabel"> <Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="3">
<StringItem index="0" value="Generate new key"/>
<StringItem index="1" value="Delete exisitng key"/>
<StringItem index="2" value="Use iButton ID"/>
</StringArray>
</Property>
<Property name="selectedIndex" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="0" type="code"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="pos_messages.properties" key="tooltip.peoplesecurity" replaceFormat="AppLocal.getIntString(&quot;tooltip.peoplesecurity&quot;)"/>
</Property>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[140, 45]"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="jLabel6">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -176,12 +285,5 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="taxIdLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Tax ID"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="taxIdTextField">
</Component>
</SubComponents> </SubComponents>
</Form> </Form>
src/main/java/com/unicenta/pos/admin/PeopleView.java
+409 -351
View File
@@ -42,368 +42,426 @@ import javax.swing.*;
*/ */
public class PeopleView extends JPanel implements EditorRecord { public class PeopleView extends JPanel implements EditorRecord {
private Object m_oId; private Object m_oId;
private String m_sPassword; private String m_sPassword;
private final DirtyManager m_Dirty;
private final SentenceList m_sentrole;
private ComboBoxValModel m_RoleModel;
private final ComboBoxValModel m_ReasonModel;
/** Creates new form PeopleEditor
* @param dlAdmin
* @param dirty */
public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
private final DirtyManager m_Dirty; initComponents();
// El modelo de roles
m_sentrole = dlAdmin.getRolesList();
m_RoleModel = new ComboBoxValModel();
m_Dirty = dirty;
m_jName.getDocument().addDocumentListener(dirty);
m_jRole.addActionListener(dirty);
m_jVisible.addActionListener(dirty);
m_jImage.addPropertyChangeListener("image", dirty);
m_jcard.getDocument().addDocumentListener(dirty);
private final SentenceList m_sentrole; m_ReasonModel = new ComboBoxValModel();
private ComboBoxValModel m_RoleModel; m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));
private final ComboBoxValModel m_ReasonModel; m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));
/** webCBSecurity.setModel(m_ReasonModel);
* Creates new form PeopleEditor
* writeValueEOF();
* @param dlAdmin
* @param dirty
*/
public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
initComponents();
// El modelo de roles
m_sentrole = dlAdmin.getRolesList();
m_RoleModel = new ComboBoxValModel();
m_Dirty = dirty;
nameTextField.getDocument().addDocumentListener(dirty);
m_jRole.addActionListener(dirty);
isVisible.addActionListener(dirty);
imageEditor.addPropertyChangeListener("image", dirty);
cardIdTextField.getDocument().addDocumentListener(dirty);
m_ReasonModel = new ComboBoxValModel();
m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));
m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));
webCBSecurity.setModel(m_ReasonModel);
writeValueEOF();
}
/**
*
*/
@Override
public void writeValueEOF() {
m_oId = null;
nameTextField.setText(null);
m_sPassword = null;
m_RoleModel.setSelectedKey(null);
isVisible.setSelected(false);
cardIdTextField.setText(null);
imageEditor.setImage(null);
nameTextField.setEnabled(false);
m_jRole.setEnabled(false);
isVisible.setEnabled(false);
cardIdTextField.setEnabled(false);
imageEditor.setEnabled(false);
jButton1.setEnabled(false);
webCBSecurity.setEnabled(false);
}
/**
*
*/
@Override
public void writeValueInsert() {
m_oId = null;
nameTextField.setText(null);
m_sPassword = null;
m_RoleModel.setSelectedKey(null);
isVisible.setSelected(true);
cardIdTextField.setText(null);
imageEditor.setImage(null);
nameTextField.setEnabled(true);
m_jRole.setEnabled(true);
isVisible.setEnabled(true);
cardIdTextField.setEnabled(true);
imageEditor.setEnabled(true);
jButton1.setEnabled(true);
webCBSecurity.setEnabled(true);
}
/**
*
* @param value
*/
@Override
public void writeValueDelete(Object value) {
Object[] people = (Object[]) value;
m_oId = people[0];
nameTextField.setText(Formats.STRING.formatValue(people[1]));
m_sPassword = Formats.STRING.formatValue(people[2]);
m_RoleModel.setSelectedKey(people[3]);
isVisible.setSelected(((Boolean) people[4]).booleanValue());
cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
imageEditor.setImage((BufferedImage) people[6]);
nameTextField.setEnabled(false);
m_jRole.setEnabled(false);
isVisible.setEnabled(false);
cardIdTextField.setEnabled(false);
imageEditor.setEnabled(false);
jButton1.setEnabled(false);
webCBSecurity.setEnabled(false);
}
/**
*
* @param value
*/
@Override
public void writeValueEdit(Object value) {
Object[] people = (Object[]) value;
m_oId = people[0];
nameTextField.setText(Formats.STRING.formatValue(people[1]));
m_sPassword = Formats.STRING.formatValue(people[2]);
m_RoleModel.setSelectedKey(people[3]);
isVisible.setSelected(((Boolean) people[4]).booleanValue());
cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
imageEditor.setImage((BufferedImage) people[6]);
if (cardIdTextField.getText().length() == 16) {
cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
} else {
cardIdLabel.setText(AppLocal.getIntString("label.card"));
}
System.out.println(cardIdTextField.getText().length());
nameTextField.setEnabled(true);
m_jRole.setEnabled(true);
isVisible.setEnabled(true);
cardIdTextField.setEnabled(true);
imageEditor.setEnabled(true);
jButton1.setEnabled(true);
webCBSecurity.setEnabled(true);
}
/**
*
* @return
* @throws BasicException
*/
@Override
public Object createValue() throws BasicException {
Object[] people = new Object[7];
people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
people[1] = Formats.STRING.parseValue(nameTextField.getText());
people[2] = Formats.STRING.parseValue(m_sPassword);
people[3] = m_RoleModel.getSelectedKey();
people[4] = isVisible.isSelected();
people[5] = Formats.STRING.parseValue(cardIdTextField.getText());
people[6] = imageEditor.getImage();
return people;
}
/**
*
* @return
*/
@Override
public Component getComponent() {
return this;
}
/**
*
* @throws BasicException
*/
public void activate() throws BasicException {
m_RoleModel = new ComboBoxValModel(m_sentrole.list());
m_jRole.setModel(m_RoleModel);
}
/**
*
*/
@Override
public void refresh() {
}
/**
* This method is called from within the constructor to
* initialize the form.
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
// <editor-fold defaultstate="collapsed" desc="Generated
// Code">//GEN-BEGIN:initComponents
private void initComponents() {
nameLabel = new javax.swing.JLabel();
nameTextField = new javax.swing.JTextField();
isVisible = new javax.swing.JCheckBox();
visiableLabel = new javax.swing.JLabel();
imageLabel = new javax.swing.JLabel();
imageEditor = new com.unicenta.data.gui.JImageEditor();
jButton1 = new javax.swing.JButton();
m_jRole = new javax.swing.JComboBox();
roleLabel = new javax.swing.JLabel();
cardIdTextField = new javax.swing.JTextField();
cardIdLabel = new javax.swing.JLabel();
passwordLabel = new javax.swing.JLabel();
taxIdLabel = new javax.swing.JLabel();
taxIdTextField = new javax.swing.JTextField();
setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
setPreferredSize(new java.awt.Dimension(500, 500));
nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
nameLabel.setPreferredSize(new java.awt.Dimension(110, 30));
nameLabel.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
nameLabelMouseClicked(evt);
}
});
add(nameLabel);
nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
nameTextField.setPreferredSize(new java.awt.Dimension(0, 30));
add(nameTextField);
isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
isVisible.setPreferredSize(new java.awt.Dimension(0, 30));
add(isVisible);
visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30));
add(visiableLabel);
imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
imageLabel.setPreferredSize(new java.awt.Dimension(110, 30));
add(imageLabel);
imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
imageEditor.setPreferredSize(new java.awt.Dimension(300, 250));
add(imageEditor);
jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
jButton1.setToolTipText("");
jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
jButton1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1ActionPerformed(evt);
}
});
add(jButton1);
m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
add(m_jRole);
roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N
roleLabel.setPreferredSize(new java.awt.Dimension(110, 30));
add(roleLabel);
cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
add(cardIdTextField);
cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N
cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30));
add(cardIdLabel);
passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
add(passwordLabel);
taxIdLabel.setText("Tax ID");
add(taxIdLabel);
add(taxIdTextField);
}// </editor-fold>//GEN-END:initComponents
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
String sNewPassword = Hashcypher.changePassword(this);
if (sNewPassword != null) {
m_sPassword = sNewPassword;
m_Dirty.setDirty(true);
} }
}// GEN-LAST:event_jButton1ActionPerformed /**
*
private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed */
@Override
if (webCBSecurity.getSelectedIndex() == 0) { public void writeValueEOF() {
if (JOptionPane.showConfirmDialog(this, m_oId = null;
AppLocal.getIntString("message.cardnew"), m_jName.setText(null);
AppLocal.getIntString("title.editor"), m_sPassword = null;
JOptionPane.YES_NO_OPTION, m_RoleModel.setSelectedKey(null);
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) { m_jVisible.setSelected(false);
cardIdTextField.setText("C" + StringUtils.getCardNumber()); m_jcard.setText(null);
m_Dirty.setDirty(true); m_jImage.setImage(null);
} m_jName.setEnabled(false);
m_jRole.setEnabled(false);
m_jVisible.setEnabled(false);
m_jcard.setEnabled(false);
m_jImage.setEnabled(false);
jButton1.setEnabled(false);
webCBSecurity.setEnabled(false);
}
/**
*
*/
@Override
public void writeValueInsert() {
m_oId = null;
m_jName.setText(null);
m_sPassword = null;
m_RoleModel.setSelectedKey(null);
m_jVisible.setSelected(true);
m_jcard.setText(null);
m_jImage.setImage(null);
m_jName.setEnabled(true);
m_jRole.setEnabled(true);
m_jVisible.setEnabled(true);
m_jcard.setEnabled(true);
m_jImage.setEnabled(true);
jButton1.setEnabled(true);
webCBSecurity.setEnabled(true);
}
/**
*
* @param value
*/
@Override
public void writeValueDelete(Object value) {
Object[] people = (Object[]) value;
m_oId = people[0];
m_jName.setText(Formats.STRING.formatValue(people[1]));
m_sPassword = Formats.STRING.formatValue(people[2]);
m_RoleModel.setSelectedKey(people[3]);
m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
m_jcard.setText(Formats.STRING.formatValue(people[5]));
m_jImage.setImage((BufferedImage) people[6]);
m_jName.setEnabled(false);
m_jRole.setEnabled(false);
m_jVisible.setEnabled(false);
m_jcard.setEnabled(false);
m_jImage.setEnabled(false);
jButton1.setEnabled(false);
webCBSecurity.setEnabled(false);
} }
if (webCBSecurity.getSelectedIndex() == 1) { /**
if (JOptionPane.showConfirmDialog(this, *
AppLocal.getIntString("message.cardremove"), * @param value
AppLocal.getIntString("title.editor"), */
JOptionPane.YES_NO_OPTION, @Override
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) { public void writeValueEdit(Object value) {
cardIdTextField.setText(null); Object[] people = (Object[]) value;
m_Dirty.setDirty(true); m_oId = people[0];
} m_jName.setText(Formats.STRING.formatValue(people[1]));
m_sPassword = Formats.STRING.formatValue(people[2]);
m_RoleModel.setSelectedKey(people[3]);
m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
m_jcard.setText(Formats.STRING.formatValue(people[5]));
m_jImage.setImage((BufferedImage) people[6]);
if (m_jcard.getText().length() == 16) {
jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
} else {
jLblCardID.setText(AppLocal.getIntString("label.card"));
}
System.out.println(m_jcard.getText().length());
m_jName.setEnabled(true);
m_jRole.setEnabled(true);
m_jVisible.setEnabled(true);
m_jcard.setEnabled(true);
m_jImage.setEnabled(true);
jButton1.setEnabled(true);
webCBSecurity.setEnabled(true);
}
/**
*
* @return
* @throws BasicException
*/
@Override
public Object createValue() throws BasicException {
Object[] people = new Object[7];
people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
people[1] = Formats.STRING.parseValue(m_jName.getText());
people[2] = Formats.STRING.parseValue(m_sPassword);
people[3] = m_RoleModel.getSelectedKey();
people[4] = m_jVisible.isSelected();
people[5] = Formats.STRING.parseValue(m_jcard.getText());
people[6] = m_jImage.getImage();
return people;
} }
if (webCBSecurity.getSelectedIndex() == 2) { /**
if (JOptionPane.showConfirmDialog(this, *
AppLocal.getIntString("message.ibuttonassign"), * @return
AppLocal.getIntString("title.editor"), */
JOptionPane.OK_CANCEL_OPTION, @Override
JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION) public Component getComponent() {
return this;
{
cardIdTextField.setText(uOWWatch.getibuttonid());
cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
m_Dirty.setDirty(true);
}
} }
}// GEN-LAST:event_webCBSecurityActionPerformed /**
*
private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_nameLabelMouseClicked * @throws BasicException
if (evt.getClickCount() == 2) { */
String uuidString = m_oId.toString(); public void activate() throws BasicException {
StringSelection stringSelection = new StringSelection(uuidString);
Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard(); m_RoleModel = new ComboBoxValModel(m_sentrole.list());
clpbrd.setContents(stringSelection, null); m_jRole.setModel(m_RoleModel);
JOptionPane.showMessageDialog(null,
AppLocal.getIntString("message.uuidcopy"));
} }
}// GEN-LAST:event_nameLabelMouseClicked
/**
*
*/
@Override
public void refresh() {
}
/** This method is called from within the constructor to
* initialize the form.
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
// Variables declaration - do not modify//GEN-BEGIN:variables jLabel1 = new javax.swing.JLabel();
private javax.swing.JLabel cardIdLabel; m_jName = new javax.swing.JTextField();
private javax.swing.JTextField cardIdTextField; m_jVisible = new javax.swing.JCheckBox();
private com.unicenta.data.gui.JImageEditor imageEditor; jLabel3 = new javax.swing.JLabel();
private javax.swing.JLabel imageLabel; jLabel4 = new javax.swing.JLabel();
private javax.swing.JCheckBox isVisible; m_jImage = new com.unicenta.data.gui.JImageEditor();
private javax.swing.JButton jButton1; jButton1 = new javax.swing.JButton();
private javax.swing.JComboBox m_jRole; m_jRole = new javax.swing.JComboBox();
private javax.swing.JLabel nameLabel; jLabel2 = new javax.swing.JLabel();
private javax.swing.JTextField nameTextField; m_jcard = new javax.swing.JTextField();
private javax.swing.JLabel passwordLabel; jLblCardID = new javax.swing.JLabel();
private javax.swing.JLabel roleLabel; webCBSecurity = new com.alee.laf.combobox.WebComboBox();
private javax.swing.JLabel taxIdLabel; jLabel6 = new javax.swing.JLabel();
private javax.swing.JTextField taxIdTextField;
private javax.swing.JLabel visiableLabel;
private com.alee.laf.combobox.WebComboBox webCBSecurity;
// End of variables declaration//GEN-END:variables
setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
setPreferredSize(new java.awt.Dimension(500, 500));
jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
jLabel1MouseClicked(evt);
}
});
m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
jButton1.setToolTipText("");
jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
jButton1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1ActionPerformed(evt);
}
});
m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
webCBSecurity.setSelectedIndex(0);
webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
webCBSecurityActionPerformed(evt);
}
});
jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18)
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(15, 15, 15)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
String sNewPassword = Hashcypher.changePassword(this);
if (sNewPassword != null) {
m_sPassword = sNewPassword;
m_Dirty.setDirty(true);
}
}//GEN-LAST:event_jButton1ActionPerformed
private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_webCBSecurityActionPerformed
if(webCBSecurity.getSelectedIndex() == 0){
if (JOptionPane.showConfirmDialog(this,
AppLocal.getIntString("message.cardnew"),
AppLocal.getIntString("title.editor"),
JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
{
m_jcard.setText("C" + StringUtils.getCardNumber());
m_Dirty.setDirty(true);
}
}
if(webCBSecurity.getSelectedIndex() == 1){
if (JOptionPane.showConfirmDialog(this,
AppLocal.getIntString("message.cardremove"),
AppLocal.getIntString("title.editor"),
JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
{
m_jcard.setText(null);
m_Dirty.setDirty(true);
}
}
if(webCBSecurity.getSelectedIndex() == 2){
if (JOptionPane.showConfirmDialog(this,
AppLocal.getIntString("message.ibuttonassign"),
AppLocal.getIntString("title.editor"),
JOptionPane.OK_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
{
m_jcard.setText( uOWWatch.getibuttonid() );
jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
m_Dirty.setDirty(true);
}
}
}//GEN-LAST:event_webCBSecurityActionPerformed
private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
if (evt.getClickCount() == 2) {
String uuidString = m_oId.toString();
StringSelection stringSelection = new StringSelection(uuidString);
Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
clpbrd.setContents(stringSelection, null);
JOptionPane.showMessageDialog(null,
AppLocal.getIntString("message.uuidcopy"));
}
}//GEN-LAST:event_jLabel1MouseClicked
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
private javax.swing.JLabel jLabel6;
private javax.swing.JLabel jLblCardID;
private com.unicenta.data.gui.JImageEditor m_jImage;
private javax.swing.JTextField m_jName;
private javax.swing.JComboBox m_jRole;
private javax.swing.JCheckBox m_jVisible;
private javax.swing.JTextField m_jcard;
private com.alee.laf.combobox.WebComboBox webCBSecurity;
// End of variables declaration//GEN-END:variables
} }
src/main/java/com/unicenta/pos/config/JPanelConfigPayment.java
+37 -6
View File
@@ -53,6 +53,7 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
initPayments("external", new ConfigPaymentPanelEmpty()); initPayments("external", new ConfigPaymentPanelEmpty());
initPayments("PaymentSense", new ConfigPaymentPanelEmpty()); initPayments("PaymentSense", new ConfigPaymentPanelEmpty());
initPayments("Teya", new ConfigPaymentPanelEmpty()); initPayments("Teya", new ConfigPaymentPanelEmpty());
initPayments("MediaPayments", new ConfigPaymentPanelEmpty());
// Lector de tarjetas. // Lector de tarjetas.
jcboCardReader.addItem("Not defined"); jcboCardReader.addItem("Not defined");
@@ -91,9 +92,17 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
jcboCardReader.setSelectedItem(config.getProperty("payment.magcardreader")); jcboCardReader.setSelectedItem(config.getProperty("payment.magcardreader"));
jcboPaymentGateway.setSelectedItem(config.getProperty("payment.gateway")); jcboPaymentGateway.setSelectedItem(config.getProperty("payment.gateway"));
urlValue.setText(config.getProperty("payment.URL"));
deviceIdValue.setText(config.getProperty("payment.device-id")); String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
securityKeyValue.setText(config.getProperty("payment.security-key")); 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); paymentConfiguration.loadProperties(config);
dirty.setDirty(false); 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.magcardreader", comboValue(jcboCardReader.getSelectedItem()));
config.setProperty("payment.gateway", comboValue(jcboPaymentGateway.getSelectedItem())); config.setProperty("payment.gateway", comboValue(jcboPaymentGateway.getSelectedItem()));
config.setProperty("payment.URL", urlValue.getText());
config.setProperty("payment.device-id", deviceIdValue.getText()); String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
config.setProperty("payment.security-key", securityKeyValue.getText()); 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); paymentConfiguration.saveProperties(config);
dirty.setDirty(false); dirty.setDirty(false);
} }
@@ -275,6 +292,9 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
paymentConfiguration = paymentsName.get(comboValue(jcboPaymentGateway.getSelectedItem())); paymentConfiguration = paymentsName.get(comboValue(jcboPaymentGateway.getSelectedItem()));
if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("PaymentSense")) { if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("PaymentSense")) {
urlLabel.setText("URL");
deviceIdLabel.setText("Device ID");
securityKeyLabel.setText("Security Key");
emvConfigPanel.setVisible(Boolean.TRUE); emvConfigPanel.setVisible(Boolean.TRUE);
jcboCardReader.setSelectedItem("EMV"); jcboCardReader.setSelectedItem("EMV");
jcboCardReader.setEnabled(Boolean.FALSE); jcboCardReader.setEnabled(Boolean.FALSE);
@@ -285,7 +305,18 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
jcboCardReader.setSelectedItem("EMV"); jcboCardReader.setSelectedItem("EMV");
jcboCardReader.setEnabled(Boolean.FALSE); 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 { else {
urlLabel.setText("URL");
deviceIdLabel.setText("Device ID");
securityKeyLabel.setText("Security Key");
emvConfigPanel.setVisible(Boolean.FALSE); emvConfigPanel.setVisible(Boolean.FALSE);
jcboCardReader.setEnabled(Boolean.TRUE); jcboCardReader.setEnabled(Boolean.TRUE);
} }
src/main/java/com/unicenta/pos/customers/CustomersPayment.java
+635 -672
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/unicenta/pos/forms/DataLogicSales.java
+2700 -2552
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/unicenta/pos/payment/JPaymentVoucher.form
+20 -34
View File
@@ -40,10 +40,6 @@
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="m_jVoucher" min="-2" max="-2" attributes="0"/> <Component id="m_jVoucher" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
</Group>
</Group> </Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group> </Group>
@@ -87,9 +83,7 @@
<Component id="webLblCustomer" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="webLblCustomer" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="webLblcustomerName" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="webLblcustomerName" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="33" max="-2" attributes="0"/> <EmptySpace min="-2" pref="241" max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@@ -166,43 +160,43 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="com.alee.laf.label.WebLabel" name="webLblCustomer"> <Component class="javax.swing.JLabel" name="webLblCustomer">
<Properties> <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(&quot;label.customer&quot;)"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="18" style="1"/> <Font name="Arial" size="18" style="1"/>
</Property> </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"> <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(&quot;label.customer&quot;)"/> <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
</Property> </Property>
<Property name="toolTipText" type="java.lang.String" value=""/> <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"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 30]"/> <Dimension value="[100, 30]"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="com.alee.laf.label.WebLabel" name="voucherStatus"> <Component class="javax.swing.JLabel" name="webLblcustomerName">
<Properties> <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(&quot;label.customer&quot;)"/>
</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"> <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(&quot;label.voucherStatus&quot;)"/> <ResourceString bundle="pos_messages.properties" key="label.voucherStatus" replaceFormat="AppLocal.getIntString(&quot;label.voucherStatus&quot;)"/>
</Property> </Property>
<Property name="toolTipText" type="java.lang.String" value=""/> <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"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 30]"/> <Dimension value="[100, 30]"/>
</Property> </Property>
@@ -224,14 +218,6 @@
</Property> </Property>
</Properties> </Properties>
</Component> </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> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="jPanel11"> <Container class="javax.swing.JPanel" name="jPanel11">
src/main/java/com/unicenta/pos/payment/JPaymentVoucher.java
+128 -146
View File
@@ -183,154 +183,141 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
* WARNING: Do NOT modify this code. The content of this method is * WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor. * always regenerated by the Form Editor.
*/ */
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
jPanel4 = new javax.swing.JPanel(); jPanel4 = new javax.swing.JPanel();
jLabel5 = new javax.swing.JLabel(); jLabel5 = new javax.swing.JLabel();
m_jVoucher = new javax.swing.JComboBox(); m_jVoucher = new javax.swing.JComboBox();
jLabel1 = new javax.swing.JLabel(); jLabel1 = new javax.swing.JLabel();
m_jMoneyEuros = new javax.swing.JLabel(); m_jMoneyEuros = new javax.swing.JLabel();
webLblCustomer = new com.alee.laf.label.WebLabel(); webLblCustomer = new javax.swing.JLabel();
webLblcustomerName = new com.alee.laf.label.WebLabel(); webLblcustomerName = new javax.swing.JLabel();
voucherStatus = new com.alee.laf.label.WebLabel(); voucherStatus = new javax.swing.JLabel();
jLabel6 = new javax.swing.JLabel(); jLabel6 = new javax.swing.JLabel();
jButton1 = new javax.swing.JButton(); jPanel11 = new javax.swing.JPanel();
jPanel11 = new javax.swing.JPanel(); jPanel12 = new javax.swing.JPanel();
jPanel12 = new javax.swing.JPanel(); m_jKeys = new com.unicenta.editor.JEditorKeys();
m_jKeys = new com.unicenta.editor.JEditorKeys(); jPanel1 = new javax.swing.JPanel();
jPanel1 = new javax.swing.JPanel(); m_jTendered = new com.unicenta.editor.JEditorCurrencyPositive();
m_jTendered = new com.unicenta.editor.JEditorCurrencyPositive();
setLayout(new java.awt.BorderLayout()); setLayout(new java.awt.BorderLayout());
jLabel5.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N jLabel5.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
jLabel5.setLabelFor(m_jVoucher); jLabel5.setLabelFor(m_jVoucher);
jLabel5.setText(AppLocal.getIntString("label.voucher")); // NOI18N jLabel5.setText(AppLocal.getIntString("label.voucher")); // NOI18N
jLabel5.setPreferredSize(new java.awt.Dimension(100, 30)); jLabel5.setPreferredSize(new java.awt.Dimension(100, 30));
m_jVoucher.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N m_jVoucher.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
m_jVoucher.setPreferredSize(new java.awt.Dimension(180, 30)); m_jVoucher.setPreferredSize(new java.awt.Dimension(180, 30));
m_jVoucher.addActionListener(new java.awt.event.ActionListener() { m_jVoucher.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
m_jVoucherActionPerformed(evt); m_jVoucherActionPerformed(evt);
} }
}); });
jLabel1.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N jLabel1.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
jLabel1.setText(AppLocal.getIntString("label.voucherValue")); // NOI18N jLabel1.setText(AppLocal.getIntString("label.voucherValue")); // NOI18N
jLabel1.setPreferredSize(new java.awt.Dimension(100, 30)); jLabel1.setPreferredSize(new java.awt.Dimension(100, 30));
m_jMoneyEuros.setBackground(new java.awt.Color(204, 255, 51)); m_jMoneyEuros.setBackground(new java.awt.Color(204, 255, 51));
m_jMoneyEuros.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N m_jMoneyEuros.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
m_jMoneyEuros.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); m_jMoneyEuros.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
m_jMoneyEuros.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(javax.swing.UIManager.getDefaults().getColor("Button.darkShadow")), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4))); m_jMoneyEuros.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(javax.swing.UIManager.getDefaults().getColor("Button.darkShadow")), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
m_jMoneyEuros.setOpaque(true); m_jMoneyEuros.setOpaque(true);
m_jMoneyEuros.setPreferredSize(new java.awt.Dimension(180, 30)); m_jMoneyEuros.setPreferredSize(new java.awt.Dimension(180, 30));
webLblCustomer.setText(AppLocal.getIntString("label.customer")); // NOI18N webLblCustomer.setText(AppLocal.getIntString("label.customer")); // NOI18N
webLblCustomer.setToolTipText(""); webLblCustomer.setToolTipText("");
webLblCustomer.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N webLblCustomer.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
webLblCustomer.setPreferredSize(new java.awt.Dimension(100, 30)); webLblCustomer.setPreferredSize(new java.awt.Dimension(100, 30));
webLblcustomerName.setText(AppLocal.getIntString("label.customer")); // NOI18N webLblcustomerName.setText(AppLocal.getIntString("label.customer")); // NOI18N
webLblcustomerName.setToolTipText(""); webLblcustomerName.setToolTipText("");
webLblcustomerName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N webLblcustomerName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
webLblcustomerName.setPreferredSize(new java.awt.Dimension(100, 30)); webLblcustomerName.setPreferredSize(new java.awt.Dimension(100, 30));
voucherStatus.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N voucherStatus.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
voucherStatus.setToolTipText(""); voucherStatus.setToolTipText("");
voucherStatus.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N voucherStatus.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
voucherStatus.setPreferredSize(new java.awt.Dimension(100, 30)); voucherStatus.setPreferredSize(new java.awt.Dimension(100, 30));
jLabel6.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N jLabel6.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
jLabel6.setLabelFor(m_jVoucher); jLabel6.setLabelFor(m_jVoucher);
jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
jLabel6.setPreferredSize(new java.awt.Dimension(100, 30)); jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
jButton1.setText("jButton1"); javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
jButton1.addActionListener(new java.awt.event.ActionListener() { jPanel4.setLayout(jPanel4Layout);
public void actionPerformed(java.awt.event.ActionEvent evt) { jPanel4Layout.setHorizontalGroup(
jButton1ActionPerformed(evt);
}
});
javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
jPanel4.setLayout(jPanel4Layout);
jPanel4Layout.setHorizontalGroup(
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel4Layout.createSequentialGroup()
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel4Layout.createSequentialGroup() .addGroup(jPanel4Layout.createSequentialGroup()
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGap(10, 10, 10)
.addGroup(jPanel4Layout.createSequentialGroup() .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(10, 10, 10) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel4Layout.createSequentialGroup()
.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)))
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(jPanel4Layout.createSequentialGroup() .addGroup(jPanel4Layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGroup(jPanel4Layout.createSequentialGroup() .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGap(0, 0, Short.MAX_VALUE))
.addComponent(webLblcustomerName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(jPanel4Layout.createSequentialGroup()
.addGroup(jPanel4Layout.createSequentialGroup() .addContainerGap()
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(jPanel4Layout.createSequentialGroup()
.addComponent(voucherStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
); .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
jPanel4Layout.setVerticalGroup( .addComponent(webLblcustomerName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(jPanel4Layout.createSequentialGroup()
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(voucherStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
);
jPanel4Layout.setVerticalGroup(
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel4Layout.createSequentialGroup() .addGroup(jPanel4Layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jLabel6, 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(voucherStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(voucherStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.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)
.addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .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(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)) .addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(33, 33, 33) .addGap(241, 241, 241))
.addComponent(jButton1) );
.addContainerGap())
);
add(jPanel4, java.awt.BorderLayout.CENTER); add(jPanel4, java.awt.BorderLayout.CENTER);
jPanel11.setLayout(new java.awt.BorderLayout()); jPanel11.setLayout(new java.awt.BorderLayout());
jPanel12.setLayout(new javax.swing.BoxLayout(jPanel12, javax.swing.BoxLayout.Y_AXIS)); jPanel12.setLayout(new javax.swing.BoxLayout(jPanel12, javax.swing.BoxLayout.Y_AXIS));
jPanel12.add(m_jKeys); jPanel12.add(m_jKeys);
jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
jPanel1.setLayout(new java.awt.BorderLayout()); jPanel1.setLayout(new java.awt.BorderLayout());
m_jTendered.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N m_jTendered.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
m_jTendered.setPreferredSize(new java.awt.Dimension(130, 30)); m_jTendered.setPreferredSize(new java.awt.Dimension(130, 30));
jPanel1.add(m_jTendered, java.awt.BorderLayout.CENTER); jPanel1.add(m_jTendered, java.awt.BorderLayout.CENTER);
jPanel12.add(jPanel1); jPanel12.add(jPanel1);
jPanel11.add(jPanel12, java.awt.BorderLayout.NORTH); jPanel11.add(jPanel12, java.awt.BorderLayout.NORTH);
add(jPanel11, java.awt.BorderLayout.EAST); add(jPanel11, java.awt.BorderLayout.EAST);
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
private void m_jVoucherActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jVoucherActionPerformed private void m_jVoucherActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jVoucherActionPerformed
@@ -365,27 +352,22 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
} }
}//GEN-LAST:event_m_jVoucherActionPerformed }//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.JLabel jLabel1;
private javax.swing.JLabel jLabel5;
// Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JLabel jLabel6;
private javax.swing.JButton jButton1; private javax.swing.JPanel jPanel1;
private javax.swing.JLabel jLabel1; private javax.swing.JPanel jPanel11;
private javax.swing.JLabel jLabel5; private javax.swing.JPanel jPanel12;
private javax.swing.JLabel jLabel6; private javax.swing.JPanel jPanel4;
private javax.swing.JPanel jPanel1; private com.unicenta.editor.JEditorKeys m_jKeys;
private javax.swing.JPanel jPanel11; private javax.swing.JLabel m_jMoneyEuros;
private javax.swing.JPanel jPanel12; private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
private javax.swing.JPanel jPanel4; private javax.swing.JComboBox m_jVoucher;
private com.unicenta.editor.JEditorKeys m_jKeys; private javax.swing.JLabel voucherStatus;
private javax.swing.JLabel m_jMoneyEuros; private javax.swing.JLabel webLblCustomer;
private com.unicenta.editor.JEditorCurrencyPositive m_jTendered; private javax.swing.JLabel webLblcustomerName;
private javax.swing.JComboBox m_jVoucher; // End of variables declaration//GEN-END:variables
private com.alee.laf.label.WebLabel voucherStatus;
private com.alee.laf.label.WebLabel webLblCustomer;
private com.alee.laf.label.WebLabel webLblcustomerName;
// End of variables declaration//GEN-END:variables
} }
src/main/java/com/unicenta/pos/payment/PaymentGatewayFac.java
+2
View File
@@ -41,6 +41,8 @@ public class PaymentGatewayFac {
return new PaymentGatewayPaymentSense(); return new PaymentGatewayPaymentSense();
case "Teya": case "Teya":
return new PaymentGatewayTeya(); return new PaymentGatewayTeya();
case "MediaPayments":
return new PaymentGatewayMediaPayments();
default: default:
return null; return null;
} }
src/main/java/com/unicenta/pos/payment/PaymentGatewayMediaPayments.java
+97
View File
@@ -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);
}
}
}
src/main/java/com/unicenta/pos/sales/DataLogicReceipts.java
+335 -317
View File
@@ -37,330 +37,348 @@ import java.util.List;
* @author adrianromero * @author adrianromero
*/ */
public class DataLogicReceipts extends BeanFactoryDataSingle { public class DataLogicReceipts extends BeanFactoryDataSingle {
private Session s; private Session s;
/** Creates a new instance of DataLogicReceipts */ /** Creates a new instance of DataLogicReceipts */
public DataLogicReceipts() { public DataLogicReceipts() {
}
/**
*
* @param s
*/
@Override
public void init(Session s) {
this.s = s;
}
/**
*
* @param Id
* @return
* @throws BasicException
*/
public final TicketInfo getSharedTicket(String Id) throws BasicException {
if (Id == null) {
return null;
} else {
Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?",
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
Datas.SERIALIZABLE }))
.find(Id);
return record == null ? null : (TicketInfo) record[0];
} }
}
/**
/** *
* * @param s
* @param pickupId */
* @return @Override
* @throws BasicException public void init(Session s){
*/ this.s = s;
public final TicketInfo getSharedTicketPickupId(String pickupId) throws BasicException {
if (pickupId == null) {
return null;
} else {
Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?",
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
Datas.SERIALIZABLE }))
.find(pickupId);
return record == null ? null : (TicketInfo) record[0];
} }
}
/**
/** *
* JG Dec 14 Administrator and Manager Roles always have access to ALL * @param Id
* SHAREDtickets * @return
* * @throws BasicException
* @return */
* @throws BasicException public final TicketInfo getSharedTicket(String Id) throws BasicException {
*/
public final List<SharedTicketInfo> getSharedTicketList() throws BasicException { if (Id == null) {
return null;
return (List<SharedTicketInfo>) new StaticSentence(s } else {
// , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets Object[]record = (Object[]) new StaticSentence(s
// ORDER BY ID" , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?"
, "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED " , SerializerWriteString.INSTANCE
+ "FROM sharedtickets ORDER BY PICKUPID", , new SerializerReadBasic(new Datas[] {
null, new SerializerReadClass(SharedTicketInfo.class)).list(); Datas.SERIALIZABLE})).find(Id);
} return record == null ? null : (TicketInfo) record[0];
}
/**
* Return only current APPUSER SHAREDtickets
*
* @param appuser
* @return
* @throws BasicException
*/
public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
+ "FROM sharedtickets "
+ "WHERE APPUSER =\"" + appuser + "\" ORDER BY PICKUPID";
return (List<SharedTicketInfo>) new StaticSentence(s, sql, null, new SerializerReadClass(SharedTicketInfo.class))
.list();
}
/**
* For Standard View
*
* @param id
* @param ticket
* @param pickupid
* @throws BasicException
*/
public final void insertSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
Object[] values = new Object[] {
id,
ticket.getName(),
ticket,
ticket.getUserInfo().getId(),
pickupid
};
Datas[] datas;
datas = new Datas[] {
Datas.STRING,
Datas.STRING,
Datas.SERIALIZABLE,
Datas.STRING,
Datas.INT
};
new PreparedSentence(s, "INSERT INTO sharedtickets ("
+ "ID, "
+ "NAME, "
+ "CONTENT, "
+ "APPUSER, "
+ "PICKUPID) "
+ "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
}
/**
*
* @param id
* @param ticket
* @param pickupid
* @throws BasicException
*/
public final void updateSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
Object[] values = new Object[] {
id,
ticket.getName(),
ticket,
ticket.getUserInfo().getId(),
pickupid
};
Datas[] datas = new Datas[] {
Datas.STRING,
Datas.STRING,
Datas.SERIALIZABLE,
Datas.STRING,
Datas.INT
};
new PreparedSentence(s, "UPDATE sharedtickets SET "
+ "NAME = ?, "
+ "CONTENT = ?, "
+ "APPUSER = ?, "
+ "PICKUPID = ? "
+ "WHERE ID = ?",
new SerializerWriteBasicExt(datas,
new int[] {
1, 2, 3, 4, 0 }))
.exec(values);
}
/**
*
* @param id
* @param ticket
* @param pickupid
* @throws BasicException
*/
public final void updateRSharedTicket(
final String id,
final TicketInfo ticket,
int pickupid) throws BasicException {
Object[] values = new Object[] {
id,
ticket.getName(),
ticket,
pickupid
};
Datas[] datas = new Datas[] {
Datas.STRING,
Datas.STRING,
Datas.SERIALIZABLE,
Datas.INT
};
new PreparedSentence(s, "UPDATE sharedtickets SET "
+ "NAME = ?, "
+ "CONTENT = ?, "
+ "PICKUPID = ? "
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 2, 3, 0 })).exec(values);
}
/**
* In place for multi-purposing like containing data from elsewhere and/or
* using Place and User for Notifications
*
* @param id
* @param locked
* @throws BasicException
*/
public final void lockSharedTicket(final String id, final String locked) throws BasicException {
Object[] values = new Object[] {
id,
locked
};
Datas[] datas = new Datas[] {
Datas.STRING,
Datas.STRING
};
new PreparedSentence(s, "UPDATE sharedtickets SET "
+ "LOCKED = ? "
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
}
/**
* In place for multi-purposing like flushing locks from elsewhere and/or
* using Place and User for Notifications
*
* @param id
* @param unlocked
* @throws BasicException
*/
public final void unlockSharedTicket(final String id, final String unlocked) throws BasicException {
Object[] values = new Object[] {
id,
unlocked
};
Datas[] datas = new Datas[] {
Datas.STRING,
Datas.STRING
};
new PreparedSentence(s, "UPDATE sharedtickets SET "
+ "LOCKED = ? "
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
}
/**
* For Restaurant View
*
* @param id
* @param ticket
* @param pickupid
* @throws BasicException
*/
public final void insertRSharedTicket(
final String id,
final TicketInfo ticket,
int pickupid) throws BasicException {
Object[] values = new Object[] {
id,
ticket.getName(),
ticket,
ticket.getUserInfo(),
ticket.getPickupId(),
ticket.getHost()
};
Datas[] datas;
datas = new Datas[] {
Datas.STRING,
Datas.STRING,
Datas.SERIALIZABLE,
Datas.STRING,
Datas.INT
};
new PreparedSentence(s, "INSERT INTO sharedtickets ("
+ "ID, "
+ "NAME, "
+ "CONTENT, "
+ "APPUSER, "
+ "PICKUPID) "
+ "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
}
/**
*
* @param id
* @throws BasicException
*/
public final void deleteSharedTicket(final String id) throws BasicException {
new StaticSentence(s, "DELETE FROM sharedtickets WHERE ID = ?", SerializerWriteString.INSTANCE).exec(id);
}
/**
*
* @param Id
* @return
* @throws BasicException
*/
public final Integer getPickupId(String Id) throws BasicException {
if (Id == null) {
return null;
} else {
Object[] record = (Object[]) new StaticSentence(s, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?",
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.INT })).find(Id);
return record == null ? 0 : (Integer) record[0];
} }
}
/**
*
* @param pickupId
* @return
* @throws BasicException
*/
public final TicketInfo getSharedTicketPickupId(String pickupId) throws BasicException {
if (pickupId == null) {
return null;
} else {
Object[]record = (Object[]) new StaticSentence(s
, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?"
, SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {
Datas.SERIALIZABLE})).find(pickupId);
return record == null ? null : (TicketInfo) record[0];
}
}
public final String getUserId(final String id) throws BasicException { /**
Object[] userID = (Object[]) new StaticSentence(s, "SELECT APPUSER FROM sharedtickets WHERE ID = ?", * JG Dec 14 Administrator and Manager Roles always have access to ALL SHAREDtickets
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.STRING })).find(id); * @return
if (userID == null) { * @throws BasicException
return null; */
} else { public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
return (String) userID[0];
return (List<SharedTicketInfo>) new StaticSentence(s
// , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets ORDER BY ID"
, "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
+ "FROM sharedtickets ORDER BY PICKUPID"
, null
, new SerializerReadClass(SharedTicketInfo.class)).list();
} }
}
/**
* Return only current APPUSER SHAREDtickets
* @param appuser
* @return
* @throws BasicException
*/
public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
+ "FROM sharedtickets "
+ "WHERE APPUSER =\""+ appuser +"\" ORDER BY PICKUPID";
return (List<SharedTicketInfo>) new StaticSentence(s
, sql
, null
, new SerializerReadClass(SharedTicketInfo.class)).list();
}
/**
* For Standard View
* @param id
* @param ticket
* @param pickupid
* @throws BasicException
*/
public final void insertSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
Object[] values = new Object[] {
id,
ticket.getName(),
ticket,
ticket.getUser().getId(),
pickupid
public final String getLockState(final String id, String lockState) throws BasicException { };
Object[] state = (Object[]) new StaticSentence(s, "SELECT LOCKED FROM sharedtickets WHERE ID = ?", Datas[] datas;
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { datas = new Datas[] {
Datas.STRING,
Datas.STRING,
Datas.SERIALIZABLE,
Datas.STRING,
Datas.INT
};
new PreparedSentence(s
, "INSERT INTO sharedtickets ("
+ "ID, "
+ "NAME, "
+ "CONTENT, "
+ "APPUSER, "
+ "PICKUPID) "
+ "VALUES (?, ?, ?, ?, ?)"
, new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);
}
/**
*
* @param id
* @param ticket
* @param pickupid
* @throws BasicException
*/
public final void updateSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
Object[] values = new Object[] {
id,
ticket.getName(),
ticket,
ticket.getUser().getId(),
pickupid
};
Datas[] datas = new Datas[] {
Datas.STRING,
Datas.STRING,
Datas.SERIALIZABLE,
Datas.STRING,
Datas.INT
};
new PreparedSentence(s
, "UPDATE sharedtickets SET "
+ "NAME = ?, "
+ "CONTENT = ?, "
+ "APPUSER = ?, "
+ "PICKUPID = ? "
+ "WHERE ID = ?"
, new SerializerWriteBasicExt(datas,
new int[] {
1, 2, 3, 4, 0})).exec(values);
}
/**
*
* @param id
* @param ticket
* @param pickupid
* @throws BasicException
*/
public final void updateRSharedTicket(
final String id,
final TicketInfo ticket,
int pickupid) throws BasicException {
Object[] values = new Object[] {
id,
ticket.getName(),
ticket,
pickupid
};
Datas[] datas = new Datas[] {
Datas.STRING,
Datas.STRING,
Datas.SERIALIZABLE,
Datas.INT
};
new PreparedSentence(s
, "UPDATE sharedtickets SET "
+ "NAME = ?, "
+ "CONTENT = ?, "
+ "PICKUPID = ? "
+ "WHERE ID = ?"
, new SerializerWriteBasicExt(datas, new int[] {1, 2, 3, 0})).exec(values);
}
/**
* In place for multi-purposing like containing data from elsewhere and/or
* using Place and User for Notifications
* @param id
* @param locked
* @throws BasicException
*/
public final void lockSharedTicket(final String id, final String locked) throws BasicException {
Object[] values = new Object[] {
id,
locked
};
Datas[] datas = new Datas[] {
Datas.STRING,
Datas.STRING Datas.STRING
})).find(id); };
return (String) state[0]; new PreparedSentence(s
} , "UPDATE sharedtickets SET "
+ "LOCKED = ? "
+ "WHERE ID = ?"
, new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
}
public final String getServer(final String id, String user) throws BasicException { /**
Object[] server = (Object[]) new StaticSentence(s, "SELECT appuser FROM sharedtickets WHERE ID = ?", * In place for multi-purposing like flushing locks from elsewhere and/or
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { * using Place and User for Notifications
* @param id
* @param unlocked
* @throws BasicException
*/
public final void unlockSharedTicket(final String id, final String unlocked) throws BasicException {
Object[] values = new Object[] {
id,
unlocked
};
Datas[] datas = new Datas[] {
Datas.STRING,
Datas.STRING Datas.STRING
})).find(id); };
return (String) server[0]; new PreparedSentence(s
} , "UPDATE sharedtickets SET "
+ "LOCKED = ? "
+ "WHERE ID = ?"
, new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
}
/**
* For Restaurant View
* @param id
* @param ticket
* @param pickupid
* @throws BasicException
*/
public final void insertRSharedTicket(
final String id,
final TicketInfo ticket,
int pickupid) throws BasicException {
Object[] values = new Object[] {
id,
ticket.getName(),
ticket,
ticket.getUser(),
ticket.getPickupId(),
ticket.getHost()
};
Datas[] datas;
datas = new Datas[] {
Datas.STRING,
Datas.STRING,
Datas.SERIALIZABLE,
Datas.STRING,
Datas.INT
};
new PreparedSentence(s
, "INSERT INTO sharedtickets ("
+ "ID, "
+ "NAME, "
+ "CONTENT, "
+ "APPUSER, "
+ "PICKUPID) "
+ "VALUES (?, ?, ?, ?, ?)"
, new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);
}
/**
*
* @param id
* @throws BasicException
*/
public final void deleteSharedTicket(final String id) throws BasicException {
new StaticSentence(s
, "DELETE FROM sharedtickets WHERE ID = ?"
, SerializerWriteString.INSTANCE).exec(id);
}
/**
*
* @param Id
* @return
* @throws BasicException
*/
public final Integer getPickupId(String Id) throws BasicException {
if (Id == null) {
return null;
} else {
Object[]record = (Object[]) new StaticSentence(s
, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?"
, SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {Datas.INT})).find(Id);
return record == null ? 0 : (Integer)record[0];
}
}
public final String getUserId(final String id) throws BasicException {
Object[] userID = (Object []) new StaticSentence(s
, "SELECT APPUSER FROM sharedtickets WHERE ID = ?"
, SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
if( userID == null ) {
return null;
} else {
return (String) userID[0];
}
}
public final String getLockState(final String id, String lockState) throws BasicException {
Object[] state = (Object[]) new StaticSentence(s
, "SELECT LOCKED FROM sharedtickets WHERE ID = ?"
, SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {
Datas.STRING
})).find(id);
return (String) state[0];
}
public final String getServer(final String id, String user) throws BasicException {
Object[] server = (Object[]) new StaticSentence(s
, "SELECT appuser FROM sharedtickets WHERE ID = ?"
, SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {
Datas.STRING
})).find(id);
return (String) server[0];
}
} }
src/main/java/com/unicenta/pos/sales/JPanelTicket.java
+521 -510
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/unicenta/pos/sales/restaurant/JTicketsBagRestaurantMap.java
+1011 -1005
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/unicenta/pos/ticket/TicketInfo.java
+698 -694
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/unicenta/pos/ticket/TicketLineInfo.java
+420 -474
View File
@@ -37,509 +37,455 @@ import java.util.Properties;
*/ */
public class TicketLineInfo implements SerializableWrite, SerializableRead, Serializable { public class TicketLineInfo implements SerializableWrite, SerializableRead, Serializable {
private static final long serialVersionUID = 6608012948284450199L; private static final long serialVersionUID = 6608012948284450199L;
private String m_sTicket; private String m_sTicket;
private int m_iLine; private int m_iLine;
private double multiply; private double multiply;
@Override @Override
public String toString() { public String toString() {
return new Gson().toJson(this); return new Gson().toJson(this);
}
private double price;
private TaxInfo tax;
private Properties attributes;
private String productid;
private String attsetinstid;
private Boolean updated = false;
private double newprice = 0.0;
/**
* Creates new TicketLineInfo
*
* @param productid
* @param dMultiply
* @param dPrice
* @param tax
* @param props
*/
public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
init(productid, null, dMultiply, dPrice, tax, props);
}
/**
*
* @param productid
* @param dMultiply
* @param dPrice
* @param tax
*/
public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax) {
init(productid, null, dMultiply, dPrice, tax, new Properties());
}
/**
* Example: Call from script.TotalDiscount event
*
* @param productid
* @param productname
* @param producttaxcategory
* @param productprinter
* @param dMultiply
* @param dPrice
* @param tax
*/
public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter,
double dMultiply, double dPrice, TaxInfo tax) {
Properties props = new Properties();
props.setProperty("product.name", productname);
props.setProperty("product.taxcategoryid", producttaxcategory);
props.setProperty("product.printer", productprinter); // added to props as may introduce printer redirect
init(productid, null, dMultiply, dPrice, tax, props);
}
/**
* Example: Call from script.LineDiscount event
*
* @param productname
* @param producttaxcategory
* @param productprinter //added to props as may introduce printer redirect
* @param dMultiply
* @param dPrice
* @param tax
*/
public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply,
double dPrice, TaxInfo tax) {
Properties props = new Properties();
props.setProperty("product.name", productname);
props.setProperty("product.taxcategoryid", producttaxcategory);
props.setProperty("product.printer", productprinter);
init(null, null, dMultiply, dPrice, tax, props);
}
/**
*
*/
public TicketLineInfo() {
init(null, null, 0.0, 0.0, null, new Properties());
}
/**
*
* @param product
* @param dMultiply
* @param dPrice
* @param tax
* @param attributes
*/
public TicketLineInfo(ProductInfoExt product, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
String pid;
if (product == null) {
pid = null;
tax = null;
} else {
pid = product.getID();
attributes.setProperty("product.name", product.getName());
attributes.setProperty("product.reference", product.getReference());
attributes.setProperty("product.code", product.getCode());
if (product.getMemoDate() == null) {
attributes.setProperty("product.memodate", "1900-01-01 00:00:01");
} else {
attributes.setProperty("product.memodate", product.getMemoDate());
}
attributes.setProperty("product.com", product.isCom() ? "true" : "false");
attributes.setProperty("product.constant", product.isConstant() ? "true" : "false");
if (product.getPrinter() != null) {
attributes.setProperty("product.printer", product.getPrinter());
} else {
attributes.setProperty("product.printer", "1");
}
attributes.setProperty("product.service", product.isService() ? "true" : "false");
attributes.setProperty("product.vprice", product.isVprice() ? "true" : "false");
attributes.setProperty("product.verpatrib", product.isVerpatrib() ? "true" : "false");
if (product.getTextTip() != null) {
attributes.setProperty("product.texttip", product.getTextTip());
}
attributes.setProperty("product.warranty", product.getWarranty() ? "true" : "false");
if (product.getAttributeSetID() != null) {
attributes.setProperty("product.attsetid", product.getAttributeSetID());
}
attributes.setProperty("product.taxcategoryid", product.getTaxCategoryID());
if (product.getCategoryID() != null) {
attributes.setProperty("product.categoryid", product.getCategoryID());
}
if ("true".equals(attributes.getProperty("ticket.updated"))) {
attributes.setProperty("ticket.updated", "false");
} else {
attributes.setProperty("ticket.updated", "true");
}
} }
init(pid, null, dMultiply, dPrice, tax, attributes); private double price;
} private TaxInfo tax;
private Properties attributes;
/** private String productid;
* private String attsetinstid;
* @param oProduct private Boolean updated = false;
* @param dPrice
* @param tax private double newprice = 0.0;
* @param attributes
*/ /** Creates new TicketLineInfo
public TicketLineInfo(ProductInfoExt oProduct, double dPrice, TaxInfo tax, Properties attributes) { * @param productid
this(oProduct, 1.0, dPrice, tax, attributes); * @param dMultiply
} * @param dPrice
* @param tax
/** * @param props */
* public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
* @param line init(productid, null, dMultiply, dPrice, tax, props);
*/
public TicketLineInfo(TicketLineInfo line) {
init(line.productid, line.attsetinstid, line.multiply, line.price,
line.tax, (Properties) line.attributes.clone());
}
private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax,
Properties attributes) {
this.productid = productid;
this.attsetinstid = attsetinstid;
multiply = dMultiply;
price = dPrice;
this.tax = tax;
this.attributes = attributes;
m_sTicket = null;
m_iLine = -1;
}
void setTicket(String ticket, int line) {
m_sTicket = ticket;
m_iLine = line;
}
/**
*
* @param dp
* @throws BasicException
*/
@Override
public void writeValues(DataWrite dp) throws BasicException {
dp.setString(1, m_sTicket);
dp.setInt(2, m_iLine);
dp.setString(3, productid);
dp.setString(4, attsetinstid);
dp.setDouble(5, multiply);
dp.setDouble(6, price);
dp.setString(7, tax.getId());
try {
ByteArrayOutputStream o = new ByteArrayOutputStream();
attributes.storeToXML(o, AppLocal.APP_NAME, "UTF-8");
dp.setBytes(8, o.toByteArray());
} catch (IOException e) {
dp.setBytes(8, null);
} }
}
/** /**
* *
* @param dr * @param productid
* @throws BasicException * @param dMultiply
*/ * @param dPrice
@Override * @param tax
public void readValues(DataRead dr) throws BasicException { */
m_sTicket = dr.getString(1); public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax) {
m_iLine = dr.getInt(2); init(productid, null, dMultiply, dPrice, tax, new Properties());
productid = dr.getString(3);
attsetinstid = dr.getString(4);
multiply = dr.getDouble(5);
price = dr.getDouble(6);
tax = new TaxInfo(
dr.getString(7),
dr.getString(8),
dr.getString(9),
dr.getString(10),
dr.getString(11),
dr.getDouble(12),
dr.getBoolean(13),
dr.getInt(14));
attributes = new Properties();
try {
byte[] img = dr.getBytes(15);
if (img != null) {
attributes.loadFromXML(new ByteArrayInputStream(img));
}
} catch (IOException e) {
} }
}
/** /**
* * Example: Call from script.TotalDiscount event
* @return * @param productid
*/ * @param productname
public TicketLineInfo copyTicketLine() { * @param producttaxcategory
TicketLineInfo l = new TicketLineInfo(); * @param productprinter
l.productid = productid; * @param dMultiply
l.attsetinstid = attsetinstid; * @param dPrice
l.multiply = multiply; * @param tax
l.price = price; */
l.tax = tax; public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
l.attributes = (Properties) attributes.clone(); Properties props = new Properties();
props.setProperty("product.name", productname);
return l; props.setProperty("product.taxcategoryid", producttaxcategory);
} props.setProperty("product.printer", productprinter); //added to props as may introduce printer redirect
/** init(productid, null, dMultiply, dPrice, tax, props);
*
* @return
*/
public int getTicketLine() {
return m_iLine;
}
// These are the Lookups
public String getProductID() {
return productid;
}
public String getProductCategoryID() {
return (attributes.getProperty("product.categoryid"));
}
public String getProductAttSetId() {
return attributes.getProperty("product.attsetid");
}
public String getProductAttSetInstId() {
return attsetinstid;
}
public String getProductAttSetInstDesc() {
return attributes.getProperty("product.attsetdesc", "");
}
public String getProductTaxCategoryID() {
return (attributes.getProperty("product.taxcategoryid"));
}
public String getTicketUpdated() {
return (attributes.getProperty("ticket.updated"));
}
public TaxInfo getTaxInfo() {
return tax;
}
public void setTaxInfo(TaxInfo oTaxInfo) {
tax = oTaxInfo;
}
// These appear on Printed TicketLine
public String getProductName() {
return attributes.getProperty("product.name");
}
public String getProductMemoDate() {
return attributes.getProperty("product.memodate");
}
public double getPrice() {
return price;
}
public double getMultiply() {
return multiply;
}
public double getTaxRate() {
return tax == null ? 0.0 : tax.getRate();
}
public double getNewPrice() {
newprice = price * (1.0 + getTaxRate());
return price;
}
public String getProductPrinter() {
return attributes.getProperty("product.printer");
}
// These are the Summaries
public double getPriceTax() {
return price * (1.0 + getTaxRate());
}
public Properties getProperties() {
return attributes;
}
public String getProperty(String key) {
return attributes.getProperty(key);
}
public String getProperty(String key, String defaultvalue) {
return attributes.getProperty(key, defaultvalue);
}
// These are Ticket Totals
public double getTax() {
return price * multiply * getTaxRate();
}
public double getValue() {
return price * multiply * (1.0 + getTaxRate());
}
public double getSubValue() {
return price * multiply;
}
// SETTERS
public void setPrice(double dValue) {
price = dValue;
}
public void setPriceTax(double dValue) {
price = dValue / (1.0 + getTaxRate());
}
public void setMultiply(double dValue) {
multiply = dValue;
}
public void setProperty(String key, String value) {
attributes.setProperty(key, value);
}
public void setProductTaxCategoryID(String taxID) {
attributes.setProperty("product.taxcategoryid", taxID);
}
public void setProductAttSetInstId(String value) {
attsetinstid = value;
}
public void setProductAttSetInstDesc(String value) {
if (value == null) {
attributes.remove(value);
} else {
attributes.setProperty("product.attsetdesc", value);
} }
}
public void setTicketUpdated(String key, String value) { /**
attributes.setProperty("ticket.updated", value); * Example: Call from script.LineDiscount event
} * @param productname
* @param producttaxcategory
* @param productprinter //added to props as may introduce printer redirect
* @param dMultiply
* @param dPrice
* @param tax
*/
public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
public void setProductPrinter(String value) { Properties props = new Properties();
if (value == null) { props.setProperty("product.name", productname);
attributes.remove(value); props.setProperty("product.taxcategoryid", producttaxcategory);
} else { props.setProperty("product.printer", productprinter);
attributes.setProperty("product.printer", value);
init(null, null, dMultiply, dPrice, tax, props);
} }
}
/** /**
* *
* @return */
*/ public TicketLineInfo() {
// Print to actual ${ticketline init(null, null, 0.0, 0.0, null, new Properties());
public String printReference() { }
return StringUtils.encodeXML(attributes.getProperty("product.reference"));
}
public String printCode() { /**
return StringUtils.encodeXML(attributes.getProperty("product.code")); *
} * @param product
* @param dMultiply
* @param dPrice
* @param tax
* @param attributes
*/
public TicketLineInfo(ProductInfoExt product, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
public String printName() { String pid;
return StringUtils.encodeXML(attributes.getProperty("product.name"));
}
public String printProductMemoDate() { if (product == null) {
return StringUtils.encodeXML(attributes.getProperty("product.memodate")); pid = null;
} tax = null;
} else {
pid = product.getID();
attributes.setProperty("product.name", product.getName());
attributes.setProperty("product.reference", product.getReference());
attributes.setProperty("product.code", product.getCode());
public String printPrice() { if (product.getMemoDate() == null) {
return Formats.CURRENCY.formatValue(getPrice()); attributes.setProperty("product.memodate", "1900-01-01 00:00:01");
} } else {
attributes.setProperty("product.memodate", product.getMemoDate());
}
attributes.setProperty("product.com", product.isCom() ? "true" : "false");
attributes.setProperty("product.constant", product.isConstant() ? "true" : "false");
public String printPriceTax() { if (product.getPrinter() != null) {
return Formats.CURRENCY.formatValue(getPriceTax()); attributes.setProperty("product.printer", product.getPrinter());
} } else {
attributes.setProperty("product.printer", "1");
}
attributes.setProperty("product.service", product.isService() ? "true" : "false");
attributes.setProperty("product.vprice", product.isVprice() ? "true" : "false");
attributes.setProperty("product.verpatrib", product.isVerpatrib() ? "true" : "false");
public String printMultiply() { if (product.getTextTip() != null) {
return Formats.DOUBLE.formatValue(multiply); attributes.setProperty("product.texttip", product.getTextTip());
} }
attributes.setProperty("product.warranty", product.getWarranty()? "true" : "false");
if (product.getAttributeSetID() != null) {
attributes.setProperty("product.attsetid", product.getAttributeSetID());
}
attributes.setProperty("product.taxcategoryid", product.getTaxCategoryID());
if (product.getCategoryID() != null) {
attributes.setProperty("product.categoryid", product.getCategoryID());
}
public String printValue() { if ("true".equals(attributes.getProperty("ticket.updated"))) {
return Formats.CURRENCY.formatValue(getValue()); attributes.setProperty("ticket.updated", "false");
} } else {
attributes.setProperty("ticket.updated", "true");
}
}
public String printTaxRate() { init(pid, null, dMultiply, dPrice, tax, attributes);
return Formats.PERCENT.formatValue(getTaxRate()); }
}
public String printSubValue() { /**
return Formats.CURRENCY.formatValue(getSubValue()); *
} * @param oProduct
* @param dPrice
* @param tax
* @param attributes
*/
public TicketLineInfo(ProductInfoExt oProduct, double dPrice, TaxInfo tax, Properties attributes) {
this(oProduct, 1.0, dPrice, tax, attributes);
}
public String printTax() { /**
return Formats.CURRENCY.formatValue(getTax()); *
} * @param line
*/
public TicketLineInfo(TicketLineInfo line) {
init(line.productid, line.attsetinstid, line.multiply, line.price,
line.tax, (Properties) line.attributes.clone());
}
public String printTextTip() { private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
return attributes.getProperty("product.texttip");
}
public String printPrinter() { this.productid = productid;
return StringUtils.encodeXML(attributes.getProperty("product.printer")); this.attsetinstid = attsetinstid;
} multiply = dMultiply;
price = dPrice;
this.tax = tax;
this.attributes = attributes;
m_sTicket = null;
m_iLine = -1;
}
public boolean isProductCom() { void setTicket(String ticket, int line) {
return "true".equals(attributes.getProperty("product.com")); m_sTicket = ticket;
} m_iLine = line;
}
public boolean isProductService() { /**
return "true".equals(attributes.getProperty("product.service")); *
} * @param dp
* @throws BasicException
*/
@Override
public void writeValues(DataWrite dp) throws BasicException {
dp.setString(1, m_sTicket);
dp.setInt(2, m_iLine);
dp.setString(3, productid);
dp.setString(4, attsetinstid);
dp.setDouble(5, multiply);
dp.setDouble(6, price);
dp.setString(7, tax.getId());
public boolean isProductVprice() { try {
return "true".equals(attributes.getProperty("product.vprice")); ByteArrayOutputStream o = new ByteArrayOutputStream();
} attributes.storeToXML(o, AppLocal.APP_NAME, "UTF-8");
dp.setBytes(8, o.toByteArray());
} catch (IOException e) {
dp.setBytes(8, null);
}
}
public boolean isProductVerpatrib() { /**
return "true".equals(attributes.getProperty("product.verpatrib")); *
} * @param dr
* @throws BasicException
*/
@Override
public void readValues(DataRead dr) throws BasicException {
m_sTicket = dr.getString(1);
m_iLine = dr.getInt(2);
productid = dr.getString(3);
attsetinstid = dr.getString(4);
multiply = dr.getDouble(5);
price = dr.getDouble(6);
tax = new TaxInfo(
dr.getString(7),
dr.getString(8),
dr.getString(9),
dr.getString(10),
dr.getString(11),
dr.getDouble(12),
dr.getBoolean(13),
dr.getInt(14));
attributes = new Properties();
public boolean isProductWarranty() { try {
return "true".equals(attributes.getProperty("product.warranty")); byte[] img = dr.getBytes(15);
} if (img != null) {
attributes.loadFromXML(new ByteArrayInputStream(img));
}
} catch (IOException e) {
}
}
public boolean getUpdated() { /**
return "true".equals(attributes.getProperty("ticket.updated")); *
} * @return
*/
public TicketLineInfo copyTicketLine() {
TicketLineInfo l = new TicketLineInfo();
l.productid = productid;
l.attsetinstid = attsetinstid;
l.multiply = multiply;
l.price = price;
l.tax = tax;
l.attributes = (Properties) attributes.clone();
public void setUpdated(Boolean value) { return l;
updated = value; }
}
} /**
*
* @return
*/
public int getTicketLine() {
return m_iLine;
}
// These are the Lookups
public String getProductID() {
return productid;
}
public String getProductCategoryID() {
return (attributes.getProperty("product.categoryid"));
}
public String getProductAttSetId() {
return attributes.getProperty("product.attsetid");
}
public String getProductAttSetInstId() {
return attsetinstid;
}
public String getProductAttSetInstDesc() {
return attributes.getProperty("product.attsetdesc", "");
}
public String getProductTaxCategoryID() {
return (attributes.getProperty("product.taxcategoryid"));
}
public String getTicketUpdated() {
return (attributes.getProperty("ticket.updated"));
}
public TaxInfo getTaxInfo() {
return tax;
}
public void setTaxInfo(TaxInfo oTaxInfo) {
tax = oTaxInfo;
}
// These appear on Printed TicketLine
public String getProductName() {
return attributes.getProperty("product.name");
}
public String getProductMemoDate() {
return attributes.getProperty("product.memodate");
}
public double getPrice() {
return price;
}
public double getMultiply() {
return multiply;
}
public double getTaxRate() {
return tax == null ? 0.0 : tax.getRate();
}
public double getNewPrice() {
newprice = price * (1.0 + getTaxRate());
return price;
}
public String getProductPrinter() {
return attributes.getProperty("product.printer");
}
// These are the Summaries
public double getPriceTax() {
return price * (1.0 + getTaxRate());
}
public Properties getProperties() {
return attributes;
}
public String getProperty(String key) {
return attributes.getProperty(key);
}
public String getProperty(String key, String defaultvalue) {
return attributes.getProperty(key, defaultvalue);
}
// These are Ticket Totals
public double getTax() {
return price * multiply * getTaxRate();
}
public double getValue() {
return price * multiply * (1.0 + getTaxRate());
}
public double getSubValue() {
return price * multiply;
}
// SETTERS
public void setPrice(double dValue) {
price = dValue;
}
public void setPriceTax(double dValue) {
price = dValue / (1.0 + getTaxRate());
}
public void setMultiply(double dValue) {
multiply = dValue;
}
public void setProperty(String key, String value) {
attributes.setProperty(key, value);
}
public void setProductTaxCategoryID(String taxID){
attributes.setProperty("product.taxcategoryid",taxID);
}
public void setProductAttSetInstId(String value) {
attsetinstid = value;
}
public void setProductAttSetInstDesc(String value) {
if (value == null) {
attributes.remove(value);
} else {
attributes.setProperty("product.attsetdesc", value);
}
}
public void setTicketUpdated(String key, String value){
attributes.setProperty("ticket.updated",value);
}
public void setProductPrinter(String value) {
if (value == null) {
attributes.remove(value);
} else {
attributes.setProperty("product.printer", value);
}
}
/**
*
* @return
*/
// Print to actual ${ticketline
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;
}
}
src/main/java/com/unicenta/pos/voucher/VoucherInfo.java
+114 -106
View File
@@ -24,124 +24,132 @@ import com.unicenta.data.loader.DataRead;
import com.unicenta.data.loader.IKeyed; import com.unicenta.data.loader.IKeyed;
import com.unicenta.data.loader.SerializerRead; import com.unicenta.data.loader.SerializerRead;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class VoucherInfo implements IKeyed { public class VoucherInfo implements IKeyed {
private String id; private String id;
private String voucherNumber; private String voucherNumber;
private String customerName; private String customerName;
private double amount; private double amount;
private String status; private String status;
public VoucherInfo() { public VoucherInfo() {
} }
public VoucherInfo( public VoucherInfo(
String id, String id,
String voucherNumber, String voucherNumber,
String customerName, String customerName,
double amount, double amount,
String status) String status) {
{ this.id = id;
this.id = id; this.voucherNumber = voucherNumber;
this.voucherNumber = voucherNumber; this.customerName = customerName;
this.customerName = customerName; this.amount = amount;
this.amount = amount; this.status = status;
this.status = status; }
}
@Override @Override
public Object getKey() { public Object getKey() {
return getId(); return getId();
} }
/** /**
* @return the id * @return the id
*/ */
public String getId() { public String getId() {
return id; return id;
} }
/** /**
* @param id the id to set * @param id the id to set
*/ */
public void setId(String id) { public void setId(String id) {
this.id = id; this.id = id;
} }
/** /**
* @return the voucherNumber * @return the voucherNumber
*/ */
public String getVoucherNumber() { public String getVoucherNumber() {
return voucherNumber; return voucherNumber;
} }
/** /**
* @param voucherNumber the voucherNumber to set * @param voucherNumber the voucherNumber to set
*/ */
public void setVoucherNumber(String voucherNumber) { public void setVoucherNumber(String voucherNumber) {
this.voucherNumber = voucherNumber; this.voucherNumber = voucherNumber;
} }
/**
* @return the customerName
*/
public String getCustomerName() {
return customerName;
}
/** /**
* @param customerName the customerName to set * @return the customerName
*/ */
public void setCustomerName(String customerName) { public String getCustomerName() {
this.customerName = customerName; return customerName;
} }
/** /**
* @return the amount * @param customerName the customerName to set
*/ */
public double getAmount() { public void setCustomerName(String customerName) {
return amount; this.customerName = customerName;
} }
/** /**
* @param amount the amount to set * @return the amount
*/ */
public void setAmount(double amount) { public double getAmount() {
this.amount = amount; return amount;
} }
@Override
public String toString() {
return voucherNumber;
}
/**
* @return the status
*/
public String getStatus() {
return status;
}
/** /**
* @param status the status to set * @param amount the amount to set
*/ */
public void setStatus(String status) { public void setAmount(double amount) {
this.status = status; this.amount = amount;
} }
public static SerializerRead getSerializerRead() { @Override
return new SerializerRead() public String toString() {
{ return voucherNumber;
@Override }
public Object readValues(DataRead dr) throws BasicException {
return new VoucherInfo( /**
dr.getString(1), * @return the status
dr.getString(2), */
dr.getString(3), public String getStatus() {
dr.getDouble(4), return status;
dr.getString(5)); }
}};
} /**
* @param status the status to set
*/
public void setStatus(String status) {
this.status = status;
}
public static SerializerRead getSerializerRead() {
return new SerializerRead() {
@Override
public Object readValues(DataRead dr) throws BasicException {
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;
}
};
}
} }