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
.settings/
.project
AGENTS.md
pom.xml
+1 -6
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.unicenta</groupId>
<artifactId>unicentaopos</artifactId>
<version>5.4.0</version>
@@ -116,7 +115,6 @@
<artifactId>poi</artifactId>
<version>3.17</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
@@ -181,7 +179,6 @@
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.swinglabs.swingx</groupId>
@@ -293,7 +290,6 @@
<artifactId>DynamicJasper-core-fonts</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
@@ -361,7 +357,7 @@
<dependency>
<groupId>com.unicenta</groupId>
<artifactId>unicenta-plugins</artifactId>
<version>1.3.1</version>
<version>1.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.gluonhq</groupId>
@@ -450,7 +446,6 @@
<version>4.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
src/main/java/com/unicenta/pos/config/JPanelConfigPayment.java
+31
View File
@@ -53,6 +53,7 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
initPayments("external", new ConfigPaymentPanelEmpty());
initPayments("PaymentSense", new ConfigPaymentPanelEmpty());
initPayments("Teya", new ConfigPaymentPanelEmpty());
initPayments("MediaPayments", new ConfigPaymentPanelEmpty());
// Lector de tarjetas.
jcboCardReader.addItem("Not defined");
@@ -91,9 +92,17 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
jcboCardReader.setSelectedItem(config.getProperty("payment.magcardreader"));
jcboPaymentGateway.setSelectedItem(config.getProperty("payment.gateway"));
String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
if ("MediaPayments".equals(gateway)) {
urlValue.setText(config.getProperty("media-payments.pdq"));
deviceIdValue.setText(config.getProperty("media-payments.api-key"));
securityKeyValue.setText(config.getProperty("media-payments.secret"));
} else {
urlValue.setText(config.getProperty("payment.URL"));
deviceIdValue.setText(config.getProperty("payment.device-id"));
securityKeyValue.setText(config.getProperty("payment.security-key"));
}
paymentConfiguration.loadProperties(config);
dirty.setDirty(false);
}
@@ -107,9 +116,17 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
config.setProperty("payment.magcardreader", comboValue(jcboCardReader.getSelectedItem()));
config.setProperty("payment.gateway", comboValue(jcboPaymentGateway.getSelectedItem()));
String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
if ("MediaPayments".equals(gateway)) {
config.setProperty("media-payments.pdq", urlValue.getText());
config.setProperty("media-payments.api-key", deviceIdValue.getText());
config.setProperty("media-payments.secret", securityKeyValue.getText());
} else {
config.setProperty("payment.URL", urlValue.getText());
config.setProperty("payment.device-id", deviceIdValue.getText());
config.setProperty("payment.security-key", securityKeyValue.getText());
}
paymentConfiguration.saveProperties(config);
dirty.setDirty(false);
}
@@ -275,6 +292,9 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
paymentConfiguration = paymentsName.get(comboValue(jcboPaymentGateway.getSelectedItem()));
if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("PaymentSense")) {
urlLabel.setText("URL");
deviceIdLabel.setText("Device ID");
securityKeyLabel.setText("Security Key");
emvConfigPanel.setVisible(Boolean.TRUE);
jcboCardReader.setSelectedItem("EMV");
jcboCardReader.setEnabled(Boolean.FALSE);
@@ -285,7 +305,18 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
jcboCardReader.setSelectedItem("EMV");
jcboCardReader.setEnabled(Boolean.FALSE);
}
else if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("MediaPayments")) {
urlLabel.setText("Terminal ID");
deviceIdLabel.setText("API Key");
securityKeyLabel.setText("Security Key");
emvConfigPanel.setVisible(Boolean.TRUE);
jcboCardReader.setSelectedItem("EMV");
jcboCardReader.setEnabled(Boolean.FALSE);
}
else {
urlLabel.setText("URL");
deviceIdLabel.setText("Device ID");
securityKeyLabel.setText("Security Key");
emvConfigPanel.setVisible(Boolean.FALSE);
jcboCardReader.setEnabled(Boolean.TRUE);
}
src/main/java/com/unicenta/pos/payment/JPaymentVoucher.form
+20 -34
View File
@@ -40,10 +40,6 @@
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="m_jVoucher" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
@@ -87,9 +83,7 @@
<Component id="webLblCustomer" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="webLblcustomerName" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="33" max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" pref="241" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -166,43 +160,43 @@
</Property>
</Properties>
</Component>
<Component class="com.alee.laf.label.WebLabel" name="webLblCustomer">
<Component class="javax.swing.JLabel" name="webLblCustomer">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&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">
<Font name="Arial" size="18" style="1"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 30]"/>
</Property>
</Properties>
</Component>
<Component class="com.alee.laf.label.WebLabel" name="webLblcustomerName">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&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">
<Font name="Arial" size="14" style="0"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 30]"/>
</Property>
</Properties>
</Component>
<Component class="com.alee.laf.label.WebLabel" name="voucherStatus">
<Component class="javax.swing.JLabel" name="webLblcustomerName">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&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">
<ResourceString bundle="pos_messages.properties" key="label.voucherStatus" replaceFormat="AppLocal.getIntString(&quot;label.voucherStatus&quot;)"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 30]"/>
</Property>
@@ -224,14 +218,6 @@
</Property>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="jButton1">
<Properties>
<Property name="text" type="java.lang.String" value="jButton1"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel11">
src/main/java/com/unicenta/pos/payment/JPaymentVoucher.java
+8 -26
View File
@@ -191,11 +191,10 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
m_jVoucher = new javax.swing.JComboBox();
jLabel1 = new javax.swing.JLabel();
m_jMoneyEuros = new javax.swing.JLabel();
webLblCustomer = new com.alee.laf.label.WebLabel();
webLblcustomerName = new com.alee.laf.label.WebLabel();
voucherStatus = new com.alee.laf.label.WebLabel();
webLblCustomer = new javax.swing.JLabel();
webLblcustomerName = new javax.swing.JLabel();
voucherStatus = new javax.swing.JLabel();
jLabel6 = new javax.swing.JLabel();
jButton1 = new javax.swing.JButton();
jPanel11 = new javax.swing.JPanel();
jPanel12 = new javax.swing.JPanel();
m_jKeys = new com.unicenta.editor.JEditorKeys();
@@ -248,13 +247,6 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
jButton1.setText("jButton1");
jButton1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1ActionPerformed(evt);
}
});
javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
jPanel4.setLayout(jPanel4Layout);
jPanel4Layout.setHorizontalGroup(
@@ -270,10 +262,7 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
.addContainerGap()
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel4Layout.createSequentialGroup()
.addContainerGap()
.addComponent(jButton1)))
.addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(jPanel4Layout.createSequentialGroup()
.addContainerGap()
@@ -306,9 +295,7 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(33, 33, 33)
.addComponent(jButton1)
.addContainerGap())
.addGap(241, 241, 241))
);
add(jPanel4, java.awt.BorderLayout.CENTER);
@@ -365,13 +352,8 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
}
}//GEN-LAST:event_m_jVoucherActionPerformed
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
}//GEN-LAST:event_jButton1ActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel5;
private javax.swing.JLabel jLabel6;
@@ -383,9 +365,9 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
private javax.swing.JLabel m_jMoneyEuros;
private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
private javax.swing.JComboBox m_jVoucher;
private com.alee.laf.label.WebLabel voucherStatus;
private com.alee.laf.label.WebLabel webLblCustomer;
private com.alee.laf.label.WebLabel webLblcustomerName;
private javax.swing.JLabel voucherStatus;
private javax.swing.JLabel webLblCustomer;
private javax.swing.JLabel webLblcustomerName;
// End of variables declaration//GEN-END:variables
}
src/main/java/com/unicenta/pos/payment/PaymentGatewayFac.java
+2
View File
@@ -41,6 +41,8 @@ public class PaymentGatewayFac {
return new PaymentGatewayPaymentSense();
case "Teya":
return new PaymentGatewayTeya();
case "MediaPayments":
return new PaymentGatewayMediaPayments();
default:
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
+16 -8
View File
@@ -24,7 +24,9 @@ import com.unicenta.data.loader.DataRead;
import com.unicenta.data.loader.IKeyed;
import com.unicenta.data.loader.SerializerRead;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class VoucherInfo implements IKeyed {
private String id;
private String voucherNumber;
@@ -40,8 +42,7 @@ public class VoucherInfo implements IKeyed {
String voucherNumber,
String customerName,
double amount,
String status)
{
String status) {
this.id = id;
this.voucherNumber = voucherNumber;
this.customerName = customerName;
@@ -49,7 +50,6 @@ public class VoucherInfo implements IKeyed {
this.status = status;
}
@Override
public Object getKey() {
return getId();
@@ -111,7 +111,6 @@ public class VoucherInfo implements IKeyed {
this.amount = amount;
}
@Override
public String toString() {
return voucherNumber;
@@ -132,16 +131,25 @@ public class VoucherInfo implements IKeyed {
}
public static SerializerRead getSerializerRead() {
return new SerializerRead()
{
return new SerializerRead() {
@Override
public Object readValues(DataRead dr) throws BasicException {
return new VoucherInfo(
VoucherInfo voucherInfo = null;
try {
voucherInfo = new VoucherInfo(
dr.getString(1),
dr.getString(2),
dr.getString(3),
dr.getDouble(4),
dr.getString(5));
}};
} catch (Exception e) {
log.error("Error reading voucher info: {}", e.getMessage());
log.error(dr.getString(2));
}
return voucherInfo;
}
};
}
}
test.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB