Squash merge 5.5.0-development into main
This commit is contained in:
@@ -40,10 +40,6 @@
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Component id="m_jVoucher" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
@@ -87,9 +83,7 @@
|
||||
<Component id="webLblCustomer" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="webLblcustomerName" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace min="-2" pref="33" max="-2" attributes="0"/>
|
||||
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" pref="241" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@@ -166,43 +160,43 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="com.alee.laf.label.WebLabel" name="webLblCustomer">
|
||||
<Component class="javax.swing.JLabel" name="webLblCustomer">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString("label.customer")"/>
|
||||
</Property>
|
||||
<Property name="toolTipText" type="java.lang.String" value=""/>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="18" style="1"/>
|
||||
</Property>
|
||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||
<Dimension value="[100, 30]"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="com.alee.laf.label.WebLabel" name="webLblcustomerName">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString("label.customer")"/>
|
||||
</Property>
|
||||
<Property name="toolTipText" type="java.lang.String" value=""/>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
</Property>
|
||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||
<Dimension value="[100, 30]"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="com.alee.laf.label.WebLabel" name="voucherStatus">
|
||||
<Component class="javax.swing.JLabel" name="webLblcustomerName">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
</Property>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString("label.customer")"/>
|
||||
</Property>
|
||||
<Property name="toolTipText" type="java.lang.String" value=""/>
|
||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||
<Dimension value="[100, 30]"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="voucherStatus">
|
||||
<Properties>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
</Property>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="pos_messages.properties" key="label.voucherStatus" replaceFormat="AppLocal.getIntString("label.voucherStatus")"/>
|
||||
</Property>
|
||||
<Property name="toolTipText" type="java.lang.String" value=""/>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Arial" size="14" style="0"/>
|
||||
</Property>
|
||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||
<Dimension value="[100, 30]"/>
|
||||
</Property>
|
||||
@@ -224,14 +218,6 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JButton" name="jButton1">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="jButton1"/>
|
||||
</Properties>
|
||||
<Events>
|
||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
|
||||
</Events>
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Container>
|
||||
<Container class="javax.swing.JPanel" name="jPanel11">
|
||||
|
||||
@@ -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
|
||||
* always regenerated by the Form Editor.
|
||||
*/
|
||||
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||
private void initComponents() {
|
||||
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||
private void initComponents() {
|
||||
|
||||
jPanel4 = new javax.swing.JPanel();
|
||||
jLabel5 = new javax.swing.JLabel();
|
||||
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();
|
||||
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();
|
||||
jPanel1 = new javax.swing.JPanel();
|
||||
m_jTendered = new com.unicenta.editor.JEditorCurrencyPositive();
|
||||
jPanel4 = new javax.swing.JPanel();
|
||||
jLabel5 = new javax.swing.JLabel();
|
||||
m_jVoucher = new javax.swing.JComboBox();
|
||||
jLabel1 = new javax.swing.JLabel();
|
||||
m_jMoneyEuros = new javax.swing.JLabel();
|
||||
webLblCustomer = new javax.swing.JLabel();
|
||||
webLblcustomerName = new javax.swing.JLabel();
|
||||
voucherStatus = new javax.swing.JLabel();
|
||||
jLabel6 = new javax.swing.JLabel();
|
||||
jPanel11 = new javax.swing.JPanel();
|
||||
jPanel12 = new javax.swing.JPanel();
|
||||
m_jKeys = new com.unicenta.editor.JEditorKeys();
|
||||
jPanel1 = new javax.swing.JPanel();
|
||||
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.setLabelFor(m_jVoucher);
|
||||
jLabel5.setText(AppLocal.getIntString("label.voucher")); // NOI18N
|
||||
jLabel5.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
jLabel5.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
|
||||
jLabel5.setLabelFor(m_jVoucher);
|
||||
jLabel5.setText(AppLocal.getIntString("label.voucher")); // NOI18N
|
||||
jLabel5.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
|
||||
m_jVoucher.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
m_jVoucher.setPreferredSize(new java.awt.Dimension(180, 30));
|
||||
m_jVoucher.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
m_jVoucherActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
m_jVoucher.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
m_jVoucher.setPreferredSize(new java.awt.Dimension(180, 30));
|
||||
m_jVoucher.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
m_jVoucherActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
jLabel1.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
|
||||
jLabel1.setText(AppLocal.getIntString("label.voucherValue")); // NOI18N
|
||||
jLabel1.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
jLabel1.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
|
||||
jLabel1.setText(AppLocal.getIntString("label.voucherValue")); // NOI18N
|
||||
jLabel1.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
|
||||
m_jMoneyEuros.setBackground(new java.awt.Color(204, 255, 51));
|
||||
m_jMoneyEuros.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
|
||||
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.setOpaque(true);
|
||||
m_jMoneyEuros.setPreferredSize(new java.awt.Dimension(180, 30));
|
||||
m_jMoneyEuros.setBackground(new java.awt.Color(204, 255, 51));
|
||||
m_jMoneyEuros.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
|
||||
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.setOpaque(true);
|
||||
m_jMoneyEuros.setPreferredSize(new java.awt.Dimension(180, 30));
|
||||
|
||||
webLblCustomer.setText(AppLocal.getIntString("label.customer")); // NOI18N
|
||||
webLblCustomer.setToolTipText("");
|
||||
webLblCustomer.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
|
||||
webLblCustomer.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
webLblCustomer.setText(AppLocal.getIntString("label.customer")); // NOI18N
|
||||
webLblCustomer.setToolTipText("");
|
||||
webLblCustomer.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
|
||||
webLblCustomer.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
|
||||
webLblcustomerName.setText(AppLocal.getIntString("label.customer")); // NOI18N
|
||||
webLblcustomerName.setToolTipText("");
|
||||
webLblcustomerName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
webLblcustomerName.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
webLblcustomerName.setText(AppLocal.getIntString("label.customer")); // NOI18N
|
||||
webLblcustomerName.setToolTipText("");
|
||||
webLblcustomerName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
webLblcustomerName.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
|
||||
voucherStatus.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
|
||||
voucherStatus.setToolTipText("");
|
||||
voucherStatus.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
voucherStatus.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
voucherStatus.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
|
||||
voucherStatus.setToolTipText("");
|
||||
voucherStatus.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||
voucherStatus.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
|
||||
jLabel6.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
|
||||
jLabel6.setLabelFor(m_jVoucher);
|
||||
jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
|
||||
jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
|
||||
jLabel6.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
|
||||
jLabel6.setLabelFor(m_jVoucher);
|
||||
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(
|
||||
javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
|
||||
jPanel4.setLayout(jPanel4Layout);
|
||||
jPanel4Layout.setHorizontalGroup(
|
||||
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel4Layout.createSequentialGroup()
|
||||
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel4Layout.createSequentialGroup()
|
||||
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel4Layout.createSequentialGroup()
|
||||
.addGap(10, 10, 10)
|
||||
.addComponent(jLabel1, 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))
|
||||
.addGap(10, 10, 10)
|
||||
.addComponent(jLabel1, 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()
|
||||
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel4Layout.createSequentialGroup()
|
||||
.addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.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(
|
||||
.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)))
|
||||
.addGap(0, 0, Short.MAX_VALUE))
|
||||
.addGroup(jPanel4Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel4Layout.createSequentialGroup()
|
||||
.addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.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)
|
||||
.addGroup(jPanel4Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.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(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.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(voucherStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.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(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.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())
|
||||
);
|
||||
.addGroup(jPanel4Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.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(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.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(voucherStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.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(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.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(241, 241, 241))
|
||||
);
|
||||
|
||||
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.add(m_jKeys);
|
||||
jPanel12.setLayout(new javax.swing.BoxLayout(jPanel12, javax.swing.BoxLayout.Y_AXIS));
|
||||
jPanel12.add(m_jKeys);
|
||||
|
||||
jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
|
||||
jPanel1.setLayout(new java.awt.BorderLayout());
|
||||
jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
|
||||
jPanel1.setLayout(new java.awt.BorderLayout());
|
||||
|
||||
m_jTendered.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||
m_jTendered.setPreferredSize(new java.awt.Dimension(130, 30));
|
||||
jPanel1.add(m_jTendered, java.awt.BorderLayout.CENTER);
|
||||
m_jTendered.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||
m_jTendered.setPreferredSize(new java.awt.Dimension(130, 30));
|
||||
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);
|
||||
}// </editor-fold>//GEN-END:initComponents
|
||||
add(jPanel11, java.awt.BorderLayout.EAST);
|
||||
}// </editor-fold>//GEN-END:initComponents
|
||||
|
||||
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
|
||||
|
||||
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;
|
||||
private javax.swing.JPanel jPanel1;
|
||||
private javax.swing.JPanel jPanel11;
|
||||
private javax.swing.JPanel jPanel12;
|
||||
private javax.swing.JPanel jPanel4;
|
||||
private com.unicenta.editor.JEditorKeys m_jKeys;
|
||||
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;
|
||||
// End of variables declaration//GEN-END:variables
|
||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||
private javax.swing.JLabel jLabel1;
|
||||
private javax.swing.JLabel jLabel5;
|
||||
private javax.swing.JLabel jLabel6;
|
||||
private javax.swing.JPanel jPanel1;
|
||||
private javax.swing.JPanel jPanel11;
|
||||
private javax.swing.JPanel jPanel12;
|
||||
private javax.swing.JPanel jPanel4;
|
||||
private com.unicenta.editor.JEditorKeys m_jKeys;
|
||||
private javax.swing.JLabel m_jMoneyEuros;
|
||||
private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
|
||||
private javax.swing.JComboBox m_jVoucher;
|
||||
private javax.swing.JLabel voucherStatus;
|
||||
private javax.swing.JLabel webLblCustomer;
|
||||
private javax.swing.JLabel webLblcustomerName;
|
||||
// End of variables declaration//GEN-END:variables
|
||||
|
||||
}
|
||||
|
||||
@@ -41,6 +41,8 @@ public class PaymentGatewayFac {
|
||||
return new PaymentGatewayPaymentSense();
|
||||
case "Teya":
|
||||
return new PaymentGatewayTeya();
|
||||
case "MediaPayments":
|
||||
return new PaymentGatewayMediaPayments();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
// uniCenta oPOS - Touch Friendly Point Of Sale
|
||||
// Copyright (c) 2009-2018 uniCenta & previous Openbravo POS works
|
||||
// https://unicenta.com
|
||||
//
|
||||
// This file is part of uniCenta oPOS
|
||||
//
|
||||
// uniCenta oPOS is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// uniCenta oPOS is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with uniCenta oPOS. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
package com.unicenta.pos.payment;
|
||||
|
||||
import com.unicenta.plugins.Application;
|
||||
import com.unicenta.plugins.common.AppContext;
|
||||
import com.unicenta.pos.util.RoundUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.ArrayList;
|
||||
|
||||
@Slf4j
|
||||
public class PaymentGatewayMediaPayments implements PaymentGateway {
|
||||
|
||||
public PaymentGatewayMediaPayments() {
|
||||
}
|
||||
|
||||
Window getPaymentWindow(double amount) {
|
||||
if (amount > 0) {
|
||||
ArrayList<JPaymentSelectReceipt> paymentWindows = new ArrayList<>();
|
||||
for (Window window : Window.getWindows()) {
|
||||
if (window instanceof JPaymentSelectReceipt) {
|
||||
paymentWindows.add((JPaymentSelectReceipt) window);
|
||||
}
|
||||
}
|
||||
return paymentWindows.get(paymentWindows.size() - 1);
|
||||
} else {
|
||||
ArrayList<JPaymentSelectRefund> paymentWindows = new ArrayList<>();
|
||||
for (Window window : Window.getWindows()) {
|
||||
if (window instanceof JPaymentSelectRefund) {
|
||||
paymentWindows.add((JPaymentSelectRefund) window);
|
||||
}
|
||||
}
|
||||
return paymentWindows.get(paymentWindows.size() - 1);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(PaymentInfoMagcard payinfo) {
|
||||
|
||||
int timer = 0;
|
||||
int timeout = 180;
|
||||
|
||||
double roundedValue = RoundUtils.round(payinfo.getTotal());
|
||||
new Application().mediaPaymentsTransaction(roundedValue, getPaymentWindow(roundedValue),
|
||||
payinfo.getTransactionID().length() > 12 ? payinfo.getTransactionID() : null);
|
||||
|
||||
while (AppContext.getIsProcessing() == null || AppContext.getIsProcessing()) {
|
||||
try {
|
||||
log.info("uniCenta-oPos: waiting for payment to complete ....");
|
||||
Thread.sleep(1000);
|
||||
timer += 1;
|
||||
if (timer > timeout)
|
||||
break;
|
||||
} catch (InterruptedException e) {
|
||||
log.error(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
if (AppContext.getMediaPaymentsPaymentResult() == null) {
|
||||
payinfo.paymentError("Transaction Error! Please try again", "No Response");
|
||||
} else if ("APPROVED".equals(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus())) {
|
||||
payinfo.setCardName(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getCard().getType());
|
||||
payinfo
|
||||
.setVerification(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getVerificationMethod());
|
||||
payinfo.setChipAndPin(true);
|
||||
payinfo.paymentOK(
|
||||
AppContext.getMediaPaymentsPaymentResult().getAdditionalInformation().getRequestId(),
|
||||
AppContext.getMediaPaymentsPaymentResult().getTransactionDetails().getId(),
|
||||
AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus());
|
||||
} else {
|
||||
String errorMsg = AppContext.getMediaPaymentsPaymentResult().getErrorMessage();
|
||||
if (errorMsg == null) {
|
||||
errorMsg = AppContext.getMediaPaymentsPaymentResult().getMessage();
|
||||
}
|
||||
payinfo.paymentError("Transaction Error! Please try again", errorMsg);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user