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

Squash merge 5.5.0-development into main

Browse Source
This commit is contained in:
Hugh
2026-06-15 16:48:30 +01:00
parent aa6c87ab90
commit d095908e42
9 changed files with 405 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -11,3 +11,4 @@ docker.sock
.factorypath .factorypath
.settings/ .settings/
.project .project
AGENTS.md
pom.xml
+6 -11
View File
@@ -1,7 +1,6 @@
<?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.4.0</version>
@@ -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/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/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/voucher/VoucherInfo.java
+109 -101
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
public Object getKey() {
return getId();
}
@Override /**
public Object getKey() { * @return the id
return getId(); */
} public String getId() {
return id;
}
/** /**
* @return the id * @param id the id to set
*/ */
public String getId() { public void setId(String id) {
return id; this.id = id;
} }
/** /**
* @param id the id to set * @return the voucherNumber
*/ */
public void setId(String id) { public String getVoucherNumber() {
this.id = id; return voucherNumber;
} }
/** /**
* @return the voucherNumber * @param voucherNumber the voucherNumber to set
*/ */
public String getVoucherNumber() { public void setVoucherNumber(String voucherNumber) {
return voucherNumber; this.voucherNumber = voucherNumber;
} }
/** /**
* @param voucherNumber the voucherNumber to set * @return the customerName
*/ */
public void setVoucherNumber(String voucherNumber) { public String getCustomerName() {
this.voucherNumber = voucherNumber; return customerName;
} }
/** /**
* @return the customerName * @param customerName the customerName to set
*/ */
public String getCustomerName() { public void setCustomerName(String customerName) {
return customerName; this.customerName = customerName;
} }
/** /**
* @param customerName the customerName to set * @return the amount
*/ */
public void setCustomerName(String customerName) { public double getAmount() {
this.customerName = customerName; return amount;
} }
/** /**
* @return the amount * @param amount the amount to set
*/ */
public double getAmount() { public void setAmount(double amount) {
return amount; this.amount = amount;
} }
/** @Override
* @param amount the amount to set public String toString() {
*/ return voucherNumber;
public void setAmount(double amount) { }
this.amount = amount;
}
/**
* @return the status
*/
public String getStatus() {
return status;
}
@Override /**
public String toString() { * @param status the status to set
return voucherNumber; */
} public void setStatus(String status) {
this.status = status;
}
/** public static SerializerRead getSerializerRead() {
* @return the status return new SerializerRead() {
*/ @Override
public String getStatus() { public Object readValues(DataRead dr) throws BasicException {
return status; VoucherInfo voucherInfo = null;
}
/** try {
* @param status the status to set voucherInfo = new VoucherInfo(
*/ dr.getString(1),
public void setStatus(String status) { dr.getString(2),
this.status = status; 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));
}
public static SerializerRead getSerializerRead() { return voucherInfo;
return new SerializerRead() }
{ };
@Override }
public Object readValues(DataRead dr) throws BasicException {
return new VoucherInfo(
dr.getString(1),
dr.getString(2),
dr.getString(3),
dr.getDouble(4),
dr.getString(5));
}};
}
} }
test.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB